diff --git a/.circleci/config.yml b/.circleci/config.yml index 94261f6ef..5d64b6fa0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -489,6 +489,9 @@ jobs: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD pip install ".[dev,ludwig,qdrant,forecasting]" @@ -497,22 +500,31 @@ jobs: ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) pip install ".[dev,ludwig,qdrant,forecasting,pinecone,chromadb]" ======= pip install ".[dev,ludwig,qdrant,forecasting]" >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) source test_evadb/bin/activate bash script/test/test.sh -m "<< parameters.mode >>" diff --git a/README.md b/README.md index 036d4617f..31cad31cd 100644 --- a/README.md +++ b/README.md @@ -845,6 +845,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 @@ -852,6 +860,7 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -925,13 +934,23 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht ======= ======= ======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) - [Quick Links](#quick-links) - [Documentation](#documentation) - [Why EvaDB](#why-evadb) @@ -987,6 +1006,7 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= - [Quick Links](#quick-links) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -1078,15 +1098,34 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= ======= +======= +======= +- [Quick Links](#quick-links) +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (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 >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (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) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ## Documentation @@ -2111,14 +2150,25 @@ TIME_LIMIT 120; ======= ```sql -CREATE UDF IF NOT EXISTS PredictHouseRent FROM +CREATE FUNCTION IF NOT EXISTS PredictHouseRent FROM ( SELECT * FROM HomeRentals ) TYPE Ludwig +<<<<<<< HEAD 'predict' 'rental_price' 'time_limit' 120; >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +PREDICT 'rental_price' +TIME_LIMIT 120; +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ``` diff --git a/docs/_toc.yml b/docs/_toc.yml index b1d1f1590..268f44b45 100644 --- a/docs/_toc.yml +++ b/docs/_toc.yml @@ -353,6 +353,7 @@ parts: - file: source/overview/concepts/data-sources title: Data Sources <<<<<<< HEAD +<<<<<<< HEAD ======= - file: source/overview/concepts title: Concepts @@ -363,6 +364,8 @@ parts: - file: source/overview/concepts title: Concepts >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) #- file: source/overview/faq - caption: Use Cases @@ -370,6 +373,7 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -528,24 +532,23 @@ parts: >>>>>>> c317ee2f (updates) ======= - file: source/usecases/food-review.rst +======= + - file: source/usecases/sentiment-analysis.rst +>>>>>>> f431fb09 (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)) >>>>>>> 7dd70375 (release: merge staging into master (#1032)) @@ -658,8 +661,10 @@ parts: <<<<<<< HEAD ======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) - file: source/reference/evaql - title: Eva Query Language + title: EvaQL sections: - file: source/reference/evaql/load - file: source/reference/evaql/select @@ -672,7 +677,13 @@ parts: - file: source/reference/evaql/rename - file: source/reference/evaql/use +<<<<<<< HEAD >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +======= + - file: source/reference/api + title: Python API + +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) - file: source/reference/databases/index title: Data Sources sections: @@ -934,6 +945,7 @@ parts: >>>>>>> 7dd70375 (release: merge staging into master (#1032)) >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD - file: source/reference/vector_databases/index title: Vector Databases sections: @@ -1054,6 +1066,7 @@ parts: title: Model Training with XGBoost <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 201f901b (Starting the change for XGBoost integration into EVADb. (#1232)) <<<<<<< HEAD >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) @@ -1126,9 +1139,26 @@ parts: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 201f901b (Starting the change for XGBoost integration into EVADb. (#1232)) +<<<<<<< HEAD >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) +<<<<<<< HEAD >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +======= +======= +======= + - file: source/reference/ai/index + title: AI Engines + sections: + - file: source/reference/ai/model-train + title: Model Training +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) - file: source/reference/ai/model-forecasting title: Time Series Forecasting - file: source/reference/ai/hf @@ -1147,6 +1177,7 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -1155,6 +1186,8 @@ parts: >>>>>>> 32e513d7 (docs: updates) ======= >>>>>>> 8a8a90aa (Add stable diffusion integration (#1240)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) - file: source/reference/ai/stablediffusion title: Stable Diffusion @@ -1174,11 +1207,15 @@ parts: ======= ======= >>>>>>> 2b924b76 (Add stable diffusion integration (#1240)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) - file: source/reference/ai/custom title: Custom Model <<<<<<< HEAD ======= ======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) - file: source/reference/ai/stablediffusion title: Stable Diffusion >>>>>>> bf022329 (Add stable diffusion integration (#1240)) @@ -1197,6 +1234,7 @@ parts: title: Custom Model <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= <<<<<<< HEAD @@ -1266,6 +1304,8 @@ parts: <<<<<<< HEAD <<<<<<< HEAD ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD - file: source/reference/optimizations @@ -1284,24 +1324,32 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= - file: source/reference/ai/custom title: Custom Model <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -1355,6 +1403,11 @@ parts: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # - file: source/reference/io # title: IO Descriptors @@ -1375,12 +1428,17 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 864a7bed (docs: updates) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) - caption: Contribution Guide ======= - caption: Developer Reference @@ -1388,11 +1446,15 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= - caption: Contribution Guide >>>>>>> f398c41b (docs: updates) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -1400,6 +1462,8 @@ parts: - caption: Contribution Guide >>>>>>> f398c41b (docs: updates) >>>>>>> 864a7bed (docs: updates) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) chapters: - file: source/dev-guide/contribute title: Contributing to EvaDB diff --git a/docs/conf.py b/docs/conf.py index 0bae50489..5e28dbcf3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -160,6 +160,7 @@ ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) + # The name of the Pygments (syntax highlighting) style to use. pygments_style = "github-dark" @@ -294,6 +295,7 @@ ======= ======= +<<<<<<< HEAD for i in os.listdir("../tutorials"): if i in [ @@ -311,6 +313,7 @@ >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD <<<<<<< HEAD for i in os.listdir("../tutorials"): @@ -430,12 +433,15 @@ ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f431fb09 (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 1250ac74a..7c285c108 100644 --- a/docs/source/benchmarks/text_summarization.rst +++ b/docs/source/benchmarks/text_summarization.rst @@ -10,11 +10,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -24,6 +27,7 @@ ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= <<<<<<< HEAD @@ -31,6 +35,8 @@ ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master @@ -38,11 +44,15 @@ >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -70,6 +80,9 @@ ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Text Summarization Benchmark ============================ @@ -169,6 +182,7 @@ Prepare dataset ======= Text summarization benchmark <<<<<<< HEAD +<<<<<<< HEAD ======= Text Summarization Benchmark >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -291,15 +305,39 @@ Prepare dataset >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= +======= +======= +Text Summarization Benchmark +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (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)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. code-block:: bash @@ -317,12 +355,16 @@ In this benchmark, we compare the performance of text summarization between EvaD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -354,6 +396,8 @@ In this benchmark, we compare the performance of text summarization between EvaD <<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Use EvaDB for Text Summarization -------------------------------- >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -409,11 +453,14 @@ Use EvaDB for Text Summarization <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -422,6 +469,7 @@ Use EvaDB for Text Summarization ======= ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= @@ -429,6 +477,8 @@ Use EvaDB for Text Summarization ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= 2. Using EvaDB to summarize the CNN DailyMail News @@ -437,11 +487,15 @@ Use EvaDB for Text Summarization >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -471,6 +525,9 @@ Use EvaDB for Text Summarization ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. note:: @@ -486,7 +543,10 @@ Use EvaDB for Text Summarization <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) Loading Data Into EvaDB ~~~~~~~~~~~~~~~~~~~~~~~ @@ -518,6 +578,7 @@ Loading Data Into EvaDB >>>>>>> 7dd70375 (release: merge staging into master (#1032)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 065f25fb (release: merge staging into master (#1032)) ======= @@ -534,6 +595,8 @@ Loading Data Into EvaDB ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Loading Data Into EvaDB ~~~~~~~~~~~~~~~~~~~~~~~ @@ -593,12 +656,17 @@ Prepare sqlite database for MindsDB <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= ======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD @@ -667,6 +735,9 @@ Setup SQLite Database <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD ======= @@ -850,8 +921,17 @@ Setup SQLite Database >>>>>>> eva-master ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. code-block:: bash @@ -879,6 +959,7 @@ Install MindsDB <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -910,14 +991,20 @@ Follow the `MindsDB installation guide >>>>>> fb00f6de (ran spellchecker) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Follow the `MindsDB installation guide `_ to install it via ``pip``. ======= ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) Follow the `MindsDB nstallation guide `_ to install it via ``pip``. ======= ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) Follow the `MindsDB installation guide `_ to install it via ``pip``. >>>>>>> 62080794 (ran spellchecker) @@ -931,6 +1018,13 @@ Follow the `Setup for Source Code via pip >>>>>> 8c5b63dc (release: merge staging into master (#1032)) +======= +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. +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5b27053e (ran spellchecker) ======= @@ -1071,12 +1165,16 @@ After installation, use the ``MySQL`` client for connecting to ``MindsDB``. Upda <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -1108,6 +1206,8 @@ After installation, use the ``MySQL`` client for connecting to ``MindsDB``. Upda <<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Benchmark MindsDB ~~~~~~~~~~~~~~~~~ >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -1163,11 +1263,14 @@ Benchmark MindsDB <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1176,6 +1279,7 @@ Benchmark MindsDB ======= ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= @@ -1183,6 +1287,8 @@ Benchmark MindsDB ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= Run Experiment @@ -1191,11 +1297,15 @@ Run Experiment >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -1225,6 +1335,9 @@ Run Experiment ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Connect ``MindsDB`` to the ``sqlite`` database we created before: @@ -1274,12 +1387,16 @@ Use the ``text summarization`` model to summarize the CNN news dataset: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -1292,12 +1409,17 @@ Use the ``text summarization`` model to summarize the CNN news dataset: >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Benchmarking Results -------------------- >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -1345,22 +1467,29 @@ 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)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) ======= ======= @@ -1377,6 +1506,8 @@ Below are numbers from a server with 56 Intel(R) Xeon(R) CPU E5-2690 v4 @ 2.60GH ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Benchmarking Results -------------------- >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -1389,11 +1520,14 @@ Benchmarking Results <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1407,17 +1541,22 @@ Benchmarking Results >>>>>>> 7dd70375 (release: merge staging into master (#1032)) >>>>>>> f028c383 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -1446,6 +1585,9 @@ Benchmarking Results >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 5280661bb..4b0732b93 100644 --- a/docs/source/overview/concepts.rst +++ b/docs/source/overview/concepts.rst @@ -7,8 +7,11 @@ Concepts <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d8799826 (docs: updates) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) EvaDB is designed around three key concepts: ======= Here is a list of key concepts in EvaDB. If you have any questions, ask the community on `Slack `__. @@ -16,10 +19,14 @@ Here is a list of key concepts in EvaDB. If you have any questions, ask the comm EvaDB is designed around three key concepts: >>>>>>> 9cc72b7b (docs: updates) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= EvaDB is designed around three key concepts: ======= Here is a list of key concepts in EvaDB. If you have any questions, ask the community on `Slack `__. +<<<<<<< HEAD ======= EvaDB is designed around three key concepts: ======= @@ -27,11 +34,30 @@ Here is a list of key concepts in EvaDB. If you have any questions, ask the comm >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> d8799826 (docs: updates) +======= + +EvaQL: AI-Centric Query Language +-------------------------------- + +EvaDB supports a SQL-like query language, called ``EvaQL``, designed to assist software developers in bringing AI into their applications. + +Here is set of illustrative EvaQL queries for a ChatGPT-based video question answering app. This EvaDB app connects to collection of news videos stored in a folder and runs an AI query for extracting audio transcripts from the videos using a Hugging Face model, followed by another AI query for question answering using ChatGPT. + +.. code-block::sql + + --- Load a collection of news videos into the 'news_videos' table + --- This command returns a Pandas Dataframe with the query's output + --- In this case, the output indicates the number of loaded videos + LOAD VIDEO 'news_videos/*.mp4' INTO VIDEOS; +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) (1) AI Queries (2) AI Functions (3) AI-Centric Query Optimization +<<<<<<< HEAD .. note:: Have a question or want to give feedback? Join us on `Slack `__! @@ -237,11 +263,17 @@ To register an user-defined function, we use the :ref:`CREATE FUNCTION>>>>>> 9cc72b7b (docs: updates) ======= ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> 9cc72b7b (docs: updates) +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) --- Define an AI function that wraps around a speech-to-text model --- This model is hosted on Hugging Face which has built-in support in EvaDB --- After creating the function, we can use the function in any future query @@ -260,6 +292,7 @@ To register an user-defined function, we use the :ref:`CREATE FUNCTION`__ tailored for AI queries. Query optimization has powered traditional SQL database systems for several decades. It is the bridge that connects the declarative query language to efficient query execution on hardware. + +EvaDB accelerates AI queries using a collection of optimizations inspired by SQL database systems including cost-based function predicate reordering, function caching, sampling, etc. +>>>>>>> f431fb09 (feat: sync master staging (#1050)) AI Functions ------------ @@ -279,6 +327,7 @@ AI Functions <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -328,10 +377,16 @@ In EvaDB, ``functions`` are typically thin wrappers around AI models and are ext Here is an `illustrative AI function for classifying the digit in MNIST images `_. To register an user-defined function, we use the :ref:`CREATE FUNCTION` statement: +======= +``Functions`` are typically thin wrappers around AI models and are extensively used in queries. Here is an `illustrative AI function for classifying MNIST images `_. + +To register an user-defined function, use the ``CREATE FUNCTION`` statement: +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. code-block:: sql --- Create an MNIST image classifier function +<<<<<<< HEAD <<<<<<< HEAD --- The function's implementation code is in 'mnist_image_classifier.py' >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -345,6 +400,11 @@ To register an user-defined function, we use the :ref:`CREATE FUNCTION>>>>>> 9cc72b7b (docs: updates) >>>>>>> d8799826 (docs: updates) +======= + --- The function's implementation code is in 'mnist_image_classifier.py' +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) CREATE FUNCTION MnistImageClassifier IMPL 'mnist_image_classifier.py' @@ -357,12 +417,17 @@ After registering ``MnistImageClassifier`` function, you can call the function i <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> d8799826 (docs: updates) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) --- Get the output of 'MnistImageClassifier' on the 30th video frame (id=30) ======= --- Get the output of 'MnistImageClassifier' on frame id 30 @@ -370,11 +435,15 @@ After registering ``MnistImageClassifier`` function, you can call the function i <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= --- Get the output of 'MnistImageClassifier' on the 30th video frame (id=30) >>>>>>> 9cc72b7b (docs: updates) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -382,6 +451,8 @@ After registering ``MnistImageClassifier`` function, you can call the function i --- Get the output of 'MnistImageClassifier' on the 30th video frame (id=30) >>>>>>> 9cc72b7b (docs: updates) >>>>>>> d8799826 (docs: updates) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) --- This query returns the results of the image classification function --- In this case, it is the digit in the 30th frame in the video SELECT data, id, MnistImageClassifier(data).label @@ -428,6 +499,7 @@ After registering ``MnistImageClassifier`` function, you can call the function i LIMIT 5; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -532,6 +604,7 @@ That's it! You can now use the newly registered UDF anywhere in the query -- in >>>>>>> eva-master ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= @@ -544,6 +617,10 @@ That's it! You can now use the newly registered UDF anywhere in the query -- in >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= >>>>>>> d8799826 (docs: updates) +======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) AI-Centric Query Optimization ----------------------------- @@ -710,6 +787,17 @@ Query optimization has powered SQL database systems for several decades. It is t query2 = query2.select("data, MnistImageClassifier(data).label") response = query2.df() >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/docs/source/overview/concepts/data-sources.rst b/docs/source/overview/concepts/data-sources.rst new file mode 100644 index 000000000..689e84ac5 --- /dev/null +++ b/docs/source/overview/concepts/data-sources.rst @@ -0,0 +1,20 @@ +.. _data sources: + +Data Sources +============ + +EvaDB simplifies AI app development for two types of data: (1) structured data, and (2) unstructured data. + +Structured Data +--------------- + +Structured data refers to information that is highly organized and follows a predefined format. This format usually involves tables with rows and columns, where each column represents a specific attribute or field, and each row represents a unique record or instance. Structured data is typically found in SQL databases. + +Examples: Customer information in a CRM system, sales transactions in a financial database. + +Unstructured Data +----------------- + +Unstructured data lacks a specific structure or organized format. It doesn't fit neatly into tables with rows and columns. Instead, unstructured data can take the form of text, images, audio, video, social media posts, emails, and more. Unstructured data is diverse and can vary greatly in content, making it challenging to process and analyze without AI models. + +Examples: Social media posts, email content, images on the web. \ No newline at end of file diff --git a/docs/source/overview/getting-started.rst b/docs/source/overview/getting-started.rst index a7819066e..046225e6c 100644 --- a/docs/source/overview/getting-started.rst +++ b/docs/source/overview/getting-started.rst @@ -9,9 +9,12 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= @@ -35,6 +38,9 @@ ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +.. _getting-started: +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -72,9 +78,12 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= ======= @@ -83,12 +92,17 @@ >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= .. _Getting Started: @@ -96,11 +110,15 @@ >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -150,6 +168,9 @@ ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Getting Started ================= @@ -450,7 +471,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: @@ -463,9 +484,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] @@ -476,14 +497,27 @@ You should see a list of built-in functions including but not limited to the fol 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 @@ -1209,11 +1243,16 @@ Try out EvaDB by experimenting with the introductory `MNIST notebook on Colab >>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= The complete `MNIST notebook is available on Colab `_. Try out EvaDB by experimenting with this introductory notebook. <<<<<<< HEAD @@ -1229,6 +1268,9 @@ Try out EvaDB by experimenting with this introductory notebook. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= Try out EvaDB by experimenting with the introductory `MNIST notebook on Colab `_. @@ -1248,11 +1290,14 @@ Try out EvaDB by experimenting with the introductory `MNIST notebook on Colab >>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= The complete `Sentiment Analysis notebook is available on Colab `_. Try out EvaDB by experimenting with this notebook :) @@ -1298,11 +1343,15 @@ Try out EvaDB by experimenting with the complete `sentiment analysis notebook on >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -1395,3 +1444,6 @@ Try out EvaDB by experimenting with the complete `sentiment analysis notebook on ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 c47e3cc79..e45989aa9 100644 --- a/docs/source/overview/getting-started/installation-options.rst +++ b/docs/source/overview/getting-started/installation-options.rst @@ -195,6 +195,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. @@ -299,6 +300,9 @@ This installation option enables more efficient query execution on CPUs and GPUs >>>>>>> 87857fed (docs: updates) ======= * ``pip install evadb[ludwig]`` for installing the Ludwig model training framework. It enables use-cases related to training and fine-tunining AI models. +======= +* ``pip install evadb[ludwig]`` for installing the Ludwig model training framework. It enables use-cases related to training and fine-tuning AI models. +>>>>>>> f431fb09 (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 44f90059c..4fb6ed820 100644 --- a/docs/source/reference/ai/custom.rst +++ b/docs/source/reference/ai/custom.rst @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -26,6 +27,9 @@ >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= + +>>>>>>> f431fb09 (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 5b598e8d3..a791d0e83 100644 --- a/docs/source/reference/ai/model-forecasting.rst +++ b/docs/source/reference/ai/model-forecasting.rst @@ -17,11 +17,13 @@ ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -33,10 +35,13 @@ >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -45,6 +50,8 @@ >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. _forecast: ======= @@ -75,6 +82,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -103,9 +111,12 @@ ======= ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -126,6 +137,14 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Time Series Forecasting ======================== @@ -164,13 +183,17 @@ First, we create a table to insert required data. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -178,12 +201,17 @@ First, we create a table to insert required data. >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -213,6 +241,9 @@ First, we create a table to insert required data. >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 @@ -220,6 +251,9 @@ Next, we create a function of `TYPE Forecasting`. We must enter the column name CREATE FUNCTION IF NOT EXISTS Forecast FROM <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -227,9 +261,12 @@ Next, we create a function of `TYPE Forecasting`. We must enter the column name >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= Next, we create a UDF of `TYPE Forecasting`. We must enter the column name on which we wish to forecast using `predict`. Other options include `id` and `time` (they represent the unique id of the items and the time data if available). .. code-block:: sql @@ -244,12 +281,15 @@ 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) ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= @@ -261,6 +301,8 @@ Next, we create a UDF of `TYPE Forecasting`. We must enter the column name on wh >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> 9fe75f29 (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 @@ -274,6 +316,7 @@ Next, we create a function of `TYPE Forecasting`. We must enter the column name <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> eva-master ======= @@ -301,9 +344,12 @@ Next, we create a function of `TYPE Forecasting`. We must enter the column name ======= ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -318,6 +364,13 @@ Next, we create a function of `TYPE Forecasting`. We must enter the column name ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) (SELECT y FROM AirData) TYPE Forecasting HORIZON 12 @@ -351,6 +404,7 @@ This trains a forecasting model. The model can be called by providing the horizo <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD SELECT Forecast(); @@ -428,10 +482,13 @@ Here, the horizon is `12`. ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -439,11 +496,16 @@ Here, the horizon is `12`. >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -473,6 +535,9 @@ Here, the horizon is `12`. >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) SELECT Forecast(12); Here, the horizon is `12`, which represents the forecast 12 steps into the future. @@ -794,6 +859,7 @@ Below is an example query with `neuralforecast` with `trend` column as exogenous ======= ======= <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD FREQUENCY 'M'; ======= @@ -803,5 +869,19 @@ Below is an example query with `neuralforecast` with `trend` column as exogenous ======= FREQUENCY 'M'; >>>>>>> e8a181c5 (Add support for Neuralforecast (#1115)) +<<<<<<< HEAD >>>>>>> ca239aea (Add support for Neuralforecast (#1115)) +<<<<<<< HEAD >>>>>>> 8eeef957 (Add support for Neuralforecast (#1115)) +======= +======= +======= + FREQUENCY 'M'; +======= + SELECT Forecast(12) FROM AirData; + +Here, the horizon is `12`. +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/docs/source/reference/api.rst b/docs/source/reference/api.rst index fbc33b72b..8aaad6871 100644 --- a/docs/source/reference/api.rst +++ b/docs/source/reference/api.rst @@ -11,12 +11,16 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -34,6 +38,11 @@ Python API ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +======= +Python API +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -75,9 +84,12 @@ Python API <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= ======= @@ -86,12 +98,17 @@ Python API >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= Basic API @@ -99,11 +116,15 @@ Basic API >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -153,6 +174,9 @@ Python API ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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: @@ -171,12 +195,17 @@ To begin a querying session in EvaDB, obtain a connection with a cursor using `` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 0d46eb7c (docs: updated outdated reference to SHOW UDF) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) print(cursor.query("SHOW FUNCTIONS;").df()) ======= print(cursor.query("SHOW UDFS;").df()) @@ -184,11 +213,15 @@ To begin a querying session in EvaDB, obtain a connection with a cursor using `` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= print(cursor.query("SHOW FUNCTIONS;").df()) >>>>>>> aed2d9cf (docs: updated outdated reference to SHOW UDF) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -196,6 +229,8 @@ To begin a querying session in EvaDB, obtain a connection with a cursor using `` print(cursor.query("SHOW FUNCTIONS;").df()) >>>>>>> aed2d9cf (docs: updated outdated reference to SHOW UDF) >>>>>>> 0d46eb7c (docs: updated outdated reference to SHOW UDF) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. autosummary:: @@ -318,8 +353,11 @@ EvaDBQuery Interface <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ~evadb.EvaDBCursor.df @@ -420,12 +458,18 @@ EvaDBQuery Interface >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= ======= +<<<<<<< HEAD >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ~evadb.EvaDBCursor.df .. warning:: @@ -438,6 +482,7 @@ EvaDBQuery Interface <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -530,3 +575,8 @@ EvaDBQuery Interface ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/docs/source/reference/evaql.rst b/docs/source/reference/evaql.rst index 17613e3b9..0fbf371e7 100644 --- a/docs/source/reference/evaql.rst +++ b/docs/source/reference/evaql.rst @@ -76,6 +76,7 @@ EvaDB Query Language Reference =============================== >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD <<<<<<< HEAD ======= ======= @@ -88,12 +89,17 @@ EvaDB Query Language Reference >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> e867f37e (docs: updated images) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) EvaDB Query Language (EvaQL) is tailored for AI apps and is derived from SQL. AI models are simply function calls in a EvaQL query. This page lists all the EvaDB statements that you can leverage in your AI applications and notebooks. Get started by copying these SQL queries into a `.py` file or a Jupyter notebook. <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= EvaDB Query Language (EvaDB) is derived from SQL. It is tailored for AI-driven analytics. EvaDB allows users to invoke deep learning models in the form of functions. diff --git a/docs/source/reference/evaql/create.rst b/docs/source/reference/evaql/create.rst index 84688a873..d84373f47 100644 --- a/docs/source/reference/evaql/create.rst +++ b/docs/source/reference/evaql/create.rst @@ -196,19 +196,24 @@ To register an user-defined function, specify the implementation details of the <<<<<<< HEAD ======= -CREATE UDF ----------- +CREATE FUNCTION +--------------- -To register an user-defined function, specify the implementation details of the UDF. +To register an user-defined function, specify the implementation details of the function. .. code-block:: sql +<<<<<<< HEAD CREATE UDF IF NOT EXISTS FastRCNNObjectDetector >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +======= + CREATE FUNCTION IF NOT EXISTS FastRCNNObjectDetector +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) INPUT (frame NDARRAY UINT8(3, ANYDIM, ANYDIM)) OUTPUT (labels NDARRAY STR(ANYDIM), bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE Classification +<<<<<<< HEAD <<<<<<< HEAD IMPL 'evadb/functions/fastrcnn_object_detector.py'; >>>>>>> 54907d3e (release: merge staging into master (#1032)) @@ -571,23 +576,32 @@ Where the `parameter` is ``key value`` pair. ======= ======= IMPL 'evadb/udfs/fastrcnn_object_detector.py'; +======= + IMPL 'evadb/functions/fastrcnn_object_detector.py'; +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) .. _create-udf-train: -CREATE UDF via Training ------------------------ +CREATE FUNCTION via Training +---------------------------- To register an user-defined function by training a predication model. .. code-block:: sql - CREATE UDF IF NOT EXISTS PredictHouseRent FROM + CREATE FUNCTION IF NOT EXISTS PredictHouseRent FROM (SELECT * FROM HomeRentals) TYPE Ludwig +<<<<<<< HEAD 'predict' 'rental_price' 'time_list' 120; 'tune_for_memory' False; >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= + PREDICT 'rental_price' + TIME_LIST 120; + TUNE_FOR_MEMORY False; +>>>>>>> f431fb09 (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 718048fd1..3251ff4db 100644 --- a/docs/source/reference/evaql/drop.rst +++ b/docs/source/reference/evaql/drop.rst @@ -19,6 +19,7 @@ DROP TABLE <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -29,6 +30,11 @@ DROP TABLE ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD DROP FUNCTION ------------- @@ -227,5 +233,19 @@ DROP FUNCTION >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +DROP FUNCTION +------------- + +.. code:: mysql + + DROP FUNCTION FastRCNNObjectDetector; +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/docs/source/reference/evaql/select.rst b/docs/source/reference/evaql/select.rst index e00d8fbbf..fc6167cf3 100644 --- a/docs/source/reference/evaql/select.rst +++ b/docs/source/reference/evaql/select.rst @@ -80,9 +80,12 @@ Search for frames containing greater than 3 cars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) <<<<<<< HEAD SELECT WITH MULTIPLE FUNCTIONS ------------------------------ @@ -262,15 +265,30 @@ SELECT WITH MULTIPLE FUNCTIONS >>>>>>> 7e60bf69 (docs: updated sql statement list) ======= ======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) SELECT TUPLES WITH MULTIPLE PREDICATES -------------------------------------- ======= SELECT WITH MULTIPLE UDFS ------------------------- >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +======= +SELECT WITH MULTIPLE FUNCTIONS +------------------------------ +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 c617ccd8e..bad3ebc00 100644 --- a/docs/source/reference/evaql/show.rst +++ b/docs/source/reference/evaql/show.rst @@ -8,6 +8,7 @@ SHOW <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -43,6 +44,10 @@ SHOW FUNCTIONS SHOW UDFS --------- >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +SHOW FUNCTIONS +-------------- +>>>>>>> f431fb09 (feat: sync master staging (#1050)) List the registered user-defined functions @@ -50,6 +55,7 @@ List the registered user-defined functions <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD SHOW FUNCTIONS; ======= @@ -61,3 +67,6 @@ List the registered user-defined functions ======= SHOW UDFS; >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= + SHOW FUNCTIONS; +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/docs/source/reference/evaql/udf.rst b/docs/source/reference/evaql/udf.rst index 2f5d33ba9..f9139fb48 100644 --- a/docs/source/reference/evaql/udf.rst +++ b/docs/source/reference/evaql/udf.rst @@ -61,12 +61,17 @@ SHOW FUNCTIONS >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= -UDF -=== +Functions +========= +<<<<<<< HEAD SHOW UDFS --------- >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +SHOW FUNCTIONS +-------------- +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Here is a list of built-in user-defined functions in EvaDB. @@ -74,6 +79,7 @@ Here is a list of built-in user-defined functions in EvaDB. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD SHOW FUNCTIONS; @@ -98,13 +104,21 @@ Here is a list of built-in user-defined functions in EvaDB. SHOW FUNCTIONS; id name impl +======= + SHOW FUNCTIONS; + + id name impl +>>>>>>> f431fb09 (feat: sync master staging (#1050)) 0 FastRCNNObjectDetector evadb/functions/fastrcnn_object_detector.p 1 MVITActionRecognition evadb/functions/mvit_action_recognition.py 2 ArrayCount evadb/functions/ndarray/array_count.py 3 Crop evadb/evadb/functions/ndarray/crop.py +<<<<<<< HEAD >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) FastRCNNObjectDetector is a model for detecting objects. MVITActionRecognition is a model for recognizing actions. @@ -118,6 +132,7 @@ ArrayCount and Crop are utility functions for counting the number of objects in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD SELECT WITH MULTIPLE FUNCTIONS ------------------------------ ======= @@ -159,6 +174,12 @@ Here is a query that illustrates how to use multiple functions in a single query >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +SELECT WITH MULTIPLE FUNCTIONS +------------------------------ + +Here is a query that illustrates how to use multiple functions in a single query. +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. code:: sql diff --git a/docs/source/reference/evaql/use.rst b/docs/source/reference/evaql/use.rst index 7353e2631..1544a5b1c 100644 --- a/docs/source/reference/evaql/use.rst +++ b/docs/source/reference/evaql/use.rst @@ -189,11 +189,24 @@ The USE statement allows us to run arbitrary native queries in the connected dat USE === +<<<<<<< HEAD The USE statement allows us to run arbitary native queries in the connected database. >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (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)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. code:: text @@ -211,12 +224,16 @@ The USE statement allows us to run arbitary native queries in the connected data <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -234,6 +251,11 @@ The USE statement allows us to run arbitary native queries in the connected data ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +======= +* [native_query] is an arbitrary SQL query supported by the [database_connection]. +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -275,9 +297,12 @@ The USE statement allows us to run arbitary native queries in the connected data <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= ======= @@ -286,12 +311,17 @@ The USE statement allows us to run arbitary native queries in the connected data >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= * [native_query] is an arbitary SQL query supprted by the [database_connection]. @@ -299,11 +329,15 @@ The USE statement allows us to run arbitary native queries in the connected data >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -353,6 +387,9 @@ The USE statement allows us to run arbitary native queries in the connected data ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 fe6707ef8..dffc47595 100644 --- a/docs/source/shared/postgresql.rst +++ b/docs/source/shared/postgresql.rst @@ -23,6 +23,7 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -63,10 +64,14 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, ======= ======= >>>>>>> 25352b39 (Remove dimensions from `TEXT` and `FLOAT` (#1261)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. code-block:: ======= >>>>>>> 63510989 (Remove dimensions from `TEXT` and `FLOAT` (#1261)) ======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= .. code-block:: text <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -82,6 +87,8 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, ======= ======= ======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) .. code-block:: >>>>>>> aeb9a3be (Remove dimensions from `TEXT` and `FLOAT` (#1261)) >>>>>>> 63510989 (Remove dimensions from `TEXT` and `FLOAT` (#1261)) @@ -98,6 +105,7 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -209,6 +217,15 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= .. tab-set:: .. tab-item:: Python @@ -243,6 +260,7 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) @@ -259,6 +277,8 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -279,9 +299,12 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, <<<<<<< HEAD >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= .. tab-set:: @@ -322,4 +345,12 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/docs/source/usecases/emotion-analysis.rst b/docs/source/usecases/emotion-analysis.rst index ab0936bfe..99bb6a315 100644 --- a/docs/source/usecases/emotion-analysis.rst +++ b/docs/source/usecases/emotion-analysis.rst @@ -135,6 +135,10 @@ This query returns the faces detected in the first ten frames of the video: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -150,6 +154,9 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -157,6 +164,7 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -207,6 +215,12 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +----------+---------------------+-------------------------+ | happy.id | facedetector.bboxes | facedetector.scores | +----------+---------------------+-------------------------+ @@ -228,6 +242,11 @@ This query returns the faces detected in the first ten frames of the video: +----------+---------------------+-------------------------+ <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -249,6 +268,7 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -271,6 +291,10 @@ This query returns the faces detected in the first ten frames of the video: ======= ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +-----------------------------------------------------------------------------------------------------+ | objectdetectionvideos.id | yolo.labels | +--------------------------+-----------------------------------------------------------------+ @@ -288,11 +312,14 @@ This query returns the faces detected in the first ten frames of the video: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -305,6 +332,7 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -313,11 +341,16 @@ This query returns the faces detected in the first ten frames of the video: ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -356,6 +389,9 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Chaining Functions in a Single AI Query --------------------------------------- @@ -378,6 +414,10 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -393,6 +433,9 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -400,6 +443,7 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -450,6 +494,12 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +----------+-------------------+------------------------+------------------------+ | happy.id | Face.bbox | emotiondetector.labels | emotiondetector.scores | +----------+-------------------+------------------------+------------------------+ @@ -477,6 +527,11 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: +----------+-------------------+------------------------+------------------------+ <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -498,6 +553,7 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -520,6 +576,10 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: ======= ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +------------------------------+ | objectdetectionvideos.label | |------------------------------| @@ -537,11 +597,14 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -554,6 +617,7 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -562,11 +626,16 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -605,5 +674,8 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 12f2dc5af..88cdefc41 100644 --- a/docs/source/usecases/image-classification.rst +++ b/docs/source/usecases/image-classification.rst @@ -1,7 +1,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) .. _image-classification: ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) @@ -38,6 +41,108 @@ Image Classification Pipeline using EvaDB ========================================= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD +======= +>>>>>>> eva-master + +Image Classification +==================== + +<<<<<<< HEAD +.. raw:: html +======= +<<<<<<< HEAD +.. raw:: html +======= +1. Connect to EvaDB +------------------- +>>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +>>>>>>> eva-master + + + + + + +
+ Run on Google Colab + + View source on GitHub + + Download notebook +


+ + +Introduction +------------ + +<<<<<<< HEAD +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. +======= +<<<<<<< HEAD +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. +======= +2. Register Image Classification Model as a Function in SQL +----------------------------------------------------------- +>>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +>>>>>>> eva-master + +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 `_. + +<<<<<<< HEAD +Create Image Classification Function +------------------------------------ +======= +<<<<<<< HEAD +Create Image Classification Function +------------------------------------ +======= +3. Execute Image Classification through SQL +------------------------------------------- +>>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +>>>>>>> eva-master + +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; + +<<<<<<< HEAD +======= +======= +======= +>>>>>>> 7dd70375 (release: merge staging into master (#1032)) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +.. _image-classification: +======= +.. _image classification: + +Image Classification Pipeline using EvaDB +========================================= +>>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) Image Classification ==================== @@ -110,6 +215,7 @@ In the following query, we call the classifier on every image in the video. The SELECT MnistImageClassifier(data).label FROM mnist_video; +<<<<<<< HEAD ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -545,11 +651,80 @@ In the following query, we call the classifier on every image in the video. The <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +======= +<<<<<<< HEAD +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> eva-master +======= +======= +.. _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; + +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) This query returns the label of all the images: .. code-block:: @@ -576,12 +751,16 @@ This query returns the label of all the images: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -599,6 +778,11 @@ This query returns the label of all the images: ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +======= + +------------------------------+ +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -668,12 +852,15 @@ 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)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +------------------------------+ >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -694,6 +881,7 @@ Like normal SQL, you can also specify conditions to filter out some frames of th ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -702,6 +890,8 @@ Like normal SQL, you can also specify conditions to filter out some frames of th ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +------------------------------+ >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -709,6 +899,9 @@ Like normal SQL, you can also specify conditions to filter out some frames of th >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= @@ -717,6 +910,7 @@ Like normal SQL, you can also specify conditions to filter out some frames of th >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -754,6 +948,9 @@ Like normal SQL, you can also specify conditions to filter out some frames of th ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Filtering Based on AI Function @@ -782,9 +979,12 @@ Now, the ``DataFrame`` only contains images of the digit ``6``. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) .. include:: ../shared/footer.rst ======= >>>>>>> e867f37e (docs: updated images) @@ -878,6 +1078,7 @@ Check out our `Jupyter Notebook >>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD .. include:: ../shared/footer.rst .. include:: ../shared/designs/design7.rst @@ -950,12 +1151,26 @@ Check out our `Jupyter Notebook >>>>>> f431fb09 (feat: sync master staging (#1050)) .. include:: ../shared/footer.rst .. include:: ../shared/designs/design7.rst ======= Check out our `Jupyter Notebook `_ for working example. >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +======= +.. include:: ../shared/footer.rst +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/docs/source/usecases/image-search.rst b/docs/source/usecases/image-search.rst index 02c96fb9c..5fa019943 100644 --- a/docs/source/usecases/image-search.rst +++ b/docs/source/usecases/image-search.rst @@ -189,12 +189,17 @@ EvaQL supports the ``ORDER BY`` and ``LIMIT`` clauses to retrieve the ``top-k`` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) EvaDB contains a built-in ``Similarity(x, y)`` function that computes the Euclidean distance between ``x`` and ``y``. We will use this function to compare the feature vector of image being search (i.e., the given image) and the feature vectors of all the images in the dataset that is stored in the vector index. EvaDB's query optimizer automatically picks the correct vector index to accelerate a given EvaQL query. It uses the vector index created in the prior step to accelerate the following image search query: @@ -214,11 +219,15 @@ EvaDB contains a built-in ``Similarity(x, y)`` function that computets the Eucli <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= EvaDB contains a built-in ``Similarity(x, y)`` function that computes the Euclidean distance between ``x`` and ``y``. We will use this function to compare the feature vector of image being search (i.e., the given image) and the feature vectors of all the images in the dataset that is stored in the vector index. >>>>>>> 5b27053e (ran spellchecker) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -226,6 +235,8 @@ EvaDB contains a built-in ``Similarity(x, y)`` function that computes the Euclid EvaDB contains a built-in ``Similarity(x, y)`` function that computes the Euclidean distance between ``x`` and ``y``. We will use this function to compare the feature vector of image being search (i.e., the given image) and the feature vectors of all the images in the dataset that is stored in the vector index. >>>>>>> 5b27053e (ran spellchecker) >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) EvaDB's query optimizer automatically picks the correct vector index to accelerate a given EvaQL query. It uses the vector index created in the prior step to accelerate the following image search query: @@ -306,12 +317,17 @@ This query returns the top-5 most similar images in a ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 5678c9a3 (docs: updated images) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. include:: ../shared/footer.rst .. include:: ../shared/designs/design8.rst @@ -321,17 +337,25 @@ This query returns the top-5 most similar images in a ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5678c9a3 (docs: updated images) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= .. include:: ../shared/footer.rst .. include:: ../shared/designs/design8.rst >>>>>>> e867f37e (docs: updated images) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 5678c9a3 (docs: updated images) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/docs/source/usecases/object-detection.rst b/docs/source/usecases/object-detection.rst index 4358b1d2b..49cbd48d9 100644 --- a/docs/source/usecases/object-detection.rst +++ b/docs/source/usecases/object-detection.rst @@ -122,6 +122,10 @@ This query returns the label of all the images: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -137,6 +141,9 @@ This query returns the label of all the images: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -144,6 +151,7 @@ This query returns the label of all the images: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -194,6 +202,12 @@ This query returns the label of all the images: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +--------------------------+--------------------------------+--------------------------------+--------------------------------+ | objectdetectionvideos.id | yolo.labels | yolo.bboxes | yolo.scores | +--------------------------+--------------------------------+--------------------------------+--------------------------------+ @@ -205,6 +219,11 @@ This query returns the label of all the images: +--------------------------+--------------------------------+--------------------------------+--------------------------------+ <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -226,6 +245,7 @@ This query returns the label of all the images: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -248,6 +268,10 @@ This query returns the label of all the images: ======= ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +-----------------------------------------------------------------------------------------------------+ | objectdetectionvideos.id | yolo.labels | +--------------------------+-----------------------------------------------------------------+ @@ -265,11 +289,14 @@ This query returns the label of all the images: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -282,6 +309,7 @@ This query returns the label of all the images: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -290,11 +318,16 @@ This query returns the label of all the images: ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -333,6 +366,9 @@ This query returns the label of all the images: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Filtering Based on YOLO Function -------------------------------- @@ -352,13 +388,17 @@ 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) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -366,12 +406,17 @@ In the following query, we use the output of the object detector to retrieve a s >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -401,12 +446,18 @@ In the following query, we use the output of the object detector to retrieve a s >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) SELECT id, Yolo(data).labels FROM ObjectDetectionVideos WHERE ['person', 'car'] <@ Yolo(data).labels LIMIT 5; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -414,8 +465,11 @@ In the following query, we use the output of the object detector to retrieve a s >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= SELECT id FROM ObjectDetectionVideos @@ -431,11 +485,15 @@ 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)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -458,6 +516,8 @@ In the following query, we use the output of the object detector to retrieve a s >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) SELECT id, Yolo(data).labels FROM ObjectDetectionVideos WHERE ['person', 'car'] <@ Yolo(data).labels @@ -471,18 +531,25 @@ 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) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -520,6 +587,8 @@ In the following query, we use the output of the object detector to retrieve a s >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Now, the ``DataFrame`` only contains frames with the desired objects: @@ -528,6 +597,10 @@ Now, the ``DataFrame`` only contains frames with the desired objects: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -543,6 +616,9 @@ Now, the ``DataFrame`` only contains frames with the desired objects: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -550,6 +626,7 @@ Now, the ``DataFrame`` only contains frames with the desired objects: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -600,6 +677,12 @@ Now, the ``DataFrame`` only contains frames with the desired objects: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +--------------------------+--------------------------------------------------------------+ | objectdetectionvideos.id | yolo.labels | +--------------------------+--------------------------------------------------------------+ @@ -700,12 +783,17 @@ Now, the ``DataFrame`` only contains frames with the desired objects: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 5678c9a3 (docs: updated images) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. include:: ../shared/designs/design9.rst ======= +------------------------------+ @@ -718,11 +806,14 @@ Now, the ``DataFrame`` only contains frames with the desired objects: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) .. include:: ../shared/footer.rst @@ -731,11 +822,15 @@ Now, the ``DataFrame`` only contains frames with the desired objects: .. include:: ../shared/designs/design9.rst >>>>>>> e867f37e (docs: updated images) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= .. include:: ../shared/footer.rst >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= .. include:: ../shared/footer.rst @@ -743,3 +838,5 @@ Now, the ``DataFrame`` only contains frames with the desired objects: >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 5678c9a3 (docs: updated images) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) 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 2d72fa259..596443a28 100644 --- a/docs/source/usecases/question-answering.rst +++ b/docs/source/usecases/question-answering.rst @@ -104,6 +104,9 @@ EvaDB has built-in support for ``ChatGPT`` function from ``OpenAI``. You will ne <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) EvaDB has built-in support for a wide range of :ref:`OpenAI` models. You can also switch to another large language models that runs locally by defining a :ref:`custom AI function`. ======= <<<<<<< HEAD @@ -115,10 +118,12 @@ EvaDB has built-in support for ``ChatGPT`` function from ``OpenAI``. You will ne <<<<<<< HEAD EvaDB has built-in support for a wide range of :ref:`OpenAI` models. You can also switch to another large language models that runs locally by defining a :ref:`Custom function`. >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= EvaDB has built-in support for a wide range of :ref:`OpenAI` models. You can also switch to another large language models that runs locally by defining a :ref:`custom AI function`. >>>>>>> 35b99c88 (docs: updates) <<<<<<< HEAD +<<<<<<< HEAD ======= EvaDB has built-in support for a wide range of :ref:`OpenAI` models. You can also switch to another large language models that runs locally by defining a :ref:`Custom function`. >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -131,6 +136,10 @@ EvaDB has built-in support for ``ChatGPT`` function from ``OpenAI``. You will ne >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 32e513d7 (docs: updates) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ChatGPT function is a wrapper around OpenAI API call. You can also switch to other LLM models that can run locally. @@ -155,6 +164,10 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -170,6 +183,9 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -177,6 +193,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -227,6 +244,12 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +-------------------------------------------------------------------------------------------------------------------------+ | text_summary.text | +-------------------------------------------------------------------------------------------------------------------------+ @@ -234,6 +257,11 @@ Here is the query's output ``DataFrame``: +-------------------------------------------------------------------------------------------------------------------------+ <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -255,6 +283,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -277,6 +306,10 @@ Here is the query's output ``DataFrame``: ======= ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | text_summary.text | |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| @@ -293,11 +326,14 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -310,6 +346,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -318,11 +355,16 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -361,6 +403,9 @@ Here is the query's output ``DataFrame``: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Question Answering using ChatGPT -------------------------------- @@ -381,6 +426,10 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -396,6 +445,9 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -403,6 +455,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -453,6 +506,12 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +--------------------------------------------------------------------------------------------------------------------------+ | chatgpt.response | +--------------------------------------------------------------------------------------------------------------------------+ @@ -460,6 +519,11 @@ Here is the query's output ``DataFrame``: +--------------------------------------------------------------------------------------------------------------------------+ <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -481,6 +545,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -503,6 +568,10 @@ Here is the query's output ``DataFrame``: ======= ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | chatgpt.response | |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| @@ -519,11 +588,14 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -536,6 +608,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -544,11 +617,16 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -587,6 +665,9 @@ Here is the query's output ``DataFrame``: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. include:: ../shared/nlp.rst @@ -596,12 +677,17 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 5678c9a3 (docs: updated images) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. include:: ../shared/designs/design1.rst ======= @@ -609,16 +695,24 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5678c9a3 (docs: updated images) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= .. include:: ../shared/designs/design1.rst >>>>>>> e867f37e (docs: updated images) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 5678c9a3 (docs: updated images) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/docs/source/usecases/sentiment-analysis.rst b/docs/source/usecases/sentiment-analysis.rst index 266a8258a..2f6b07987 100644 --- a/docs/source/usecases/sentiment-analysis.rst +++ b/docs/source/usecases/sentiment-analysis.rst @@ -156,6 +156,7 @@ While running this query, EvaDB first retrieves the negative reviews and then ap >>>>>>> ae08f806 (Bump v0.3.4+ dev) .. include:: ../shared/nlp.rst +<<<<<<< HEAD <<<<<<< HEAD .. include:: ../shared/footer.rst <<<<<<< HEAD @@ -245,6 +246,9 @@ Check out our `Jupyter Notebook >>>>>> ad7bb302 (docs: updates) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 572f347e (docs: updates) ======= ======= @@ -253,6 +257,7 @@ Check out our `Jupyter Notebook `__ for working example. >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -308,3 +313,7 @@ Check out our `Jupyter Notebook >>>>>> 572f347e (docs: updates) >>>>>>> 899a029b (docs: updates) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 c48335999..1e82fe239 100644 --- a/docs/source/usecases/text-summarization.rst +++ b/docs/source/usecases/text-summarization.rst @@ -118,6 +118,10 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -133,6 +137,9 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -140,6 +147,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -190,6 +198,12 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +--------------------------------------------------------------+--------------------------------------------------------------+ | mypdfs.data | textsummarizer.summary_text | +--------------------------------------------------------------+--------------------------------------------------------------+ @@ -198,6 +212,11 @@ Here is the query's output ``DataFrame``: +--------------------------------------------------------------+--------------------------------------------------------------+ <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -219,6 +238,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -241,6 +261,10 @@ Here is the query's output ``DataFrame``: ======= ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +--------------------------------------------------------+--------------------------------------------------------+ | mypdfs.data | mypdfs.summary_text | +--------------------------------------------------------+--------------------------------------------------------+ @@ -258,11 +282,14 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -275,6 +302,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -283,11 +311,16 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -326,6 +359,9 @@ Here is the query's output ``DataFrame``: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. include:: ../shared/nlp.rst @@ -336,6 +372,9 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD .. include:: ../shared/designs/design2.rst @@ -349,14 +388,19 @@ Here is the query's output ``DataFrame``: .. include:: ../shared/designs/design2.rst >>>>>>> e867f37e (docs: updated images) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 864a7bed (docs: updates) +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) .. include:: ../shared/designs/design2.rst ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -372,3 +416,6 @@ Here is the query's output ``DataFrame``: >>>>>>> 864a7bed (docs: updates) ======= >>>>>>> 5678c9a3 (docs: updated images) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/evadb/binder/statement_binder.py b/evadb/binder/statement_binder.py index ac419d37e..35515bcac 100644 --- a/evadb/binder/statement_binder.py +++ b/evadb/binder/statement_binder.py @@ -112,17 +112,22 @@ >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) from evadb.parser.create_statement import ColumnDefinition, CreateTableStatement >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -135,6 +140,8 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.parser.create_statement import ColumnDefinition, CreateTableStatement ======= from evadb.parser.create_statement import CreateTableStatement @@ -156,6 +163,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -164,16 +174,20 @@ >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= from evadb.parser.create_statement import CreateTableStatement >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -225,6 +239,9 @@ >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 @@ -239,6 +256,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -249,6 +270,7 @@ >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -291,6 +313,7 @@ >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -307,12 +330,24 @@ >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.utils.generic_utils import ( load_function_class_from_file, string_comparison_case_insensitive, ) <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -405,21 +440,34 @@ >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= ======= +>>>>>>> eva-master +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= +======= from evadb.utils.generic_utils import load_function_class_from_file >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.utils.logging_manager import logger >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -466,6 +514,7 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -494,10 +543,22 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) inputs, outputs = [], [] if string_comparison_case_insensitive(node.function_type, "ludwig"): assert ( @@ -572,6 +633,9 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= @@ -726,16 +790,32 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): outputs.append(column) else: <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +<<<<<<< HEAD +======= + 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: +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) column.name = column.name outputs.append(column) else: inputs.append(column) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= inputs.append(column) elif string_comparison_case_insensitive(node.function_type, "sklearn"): @@ -803,6 +883,7 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): <<<<<<< HEAD ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD inputs, outputs = [], [] if string_comparison_case_insensitive(node.function_type, "ludwig"): assert ( @@ -894,6 +975,7 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -905,6 +987,13 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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" @@ -922,6 +1011,7 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): <<<<<<< HEAD <<<<<<< HEAD ======= +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -933,11 +1023,14 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -945,12 +1038,15 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= @@ -966,6 +1062,10 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @bind.register(CreateIndexStatement) def _bind_create_index_statement(self, node: CreateIndexStatement): self.bind(node.table_ref) @@ -1021,11 +1121,14 @@ def _bind_create_index_statement(self, node: CreateIndexStatement): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1038,6 +1141,7 @@ def _bind_create_index_statement(self, node: CreateIndexStatement): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -1046,11 +1150,16 @@ def _bind_create_index_statement(self, node: CreateIndexStatement): ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -1089,6 +1198,9 @@ def _bind_create_index_statement(self, node: CreateIndexStatement): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @bind.register(SelectStatement) def _bind_select_statement(self, node: SelectStatement): if node.from_table: @@ -1260,6 +1372,7 @@ def _bind_func_expr(self, node: FunctionExpression): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1303,16 +1416,32 @@ def _bind_func_expr(self, node: FunctionExpression): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) if string_comparison_case_insensitive(function_obj.type, "HuggingFace"): node.function = assign_hf_function(function_obj) elif string_comparison_case_insensitive(function_obj.type, "Ludwig"): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1320,8 +1449,11 @@ def _bind_func_expr(self, node: FunctionExpression): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= if function_obj.type == "HuggingFace": node.function = assign_hf_function(function_obj) @@ -1336,12 +1468,15 @@ def _bind_func_expr(self, node: FunctionExpression): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= @@ -1352,6 +1487,8 @@ def _bind_func_expr(self, node: FunctionExpression): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= if string_comparison_case_insensitive(function_obj.type, "HuggingFace"): node.function = assign_hf_function(function_obj) @@ -1365,6 +1502,7 @@ def _bind_func_expr(self, node: FunctionExpression): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> eva-master ======= @@ -1392,9 +1530,12 @@ def _bind_func_expr(self, node: FunctionExpression): ======= ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -1411,6 +1552,13 @@ def _bind_func_expr(self, node: FunctionExpression): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) function_class = load_function_class_from_file( function_obj.impl_file_path, "GenericLudwigModel", diff --git a/evadb/catalog/catalog_manager.py b/evadb/catalog/catalog_manager.py index f9cf4a3d3..51697dae5 100644 --- a/evadb/catalog/catalog_manager.py +++ b/evadb/catalog/catalog_manager.py @@ -584,16 +584,22 @@ def insert_function_catalog_entry( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) name, impl_file_path, type, @@ -615,11 +621,15 @@ def insert_function_catalog_entry( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ) >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -627,6 +637,8 @@ def insert_function_catalog_entry( ) >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) return function_entry def get_function_catalog_entry_by_name(self, name: str) -> FunctionCatalogEntry: @@ -702,6 +714,7 @@ def insert_index_catalog_entry( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -714,6 +727,10 @@ def insert_index_catalog_entry( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) index_def: str, ) -> IndexCatalogEntry: index_catalog_entry = self._index_service.insert_entry( @@ -732,10 +749,13 @@ def insert_index_catalog_entry( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= index_def: str, ) -> IndexCatalogEntry: @@ -779,6 +799,7 @@ def insert_index_catalog_entry( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -797,6 +818,8 @@ def insert_index_catalog_entry( ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) return index_catalog_entry diff --git a/evadb/catalog/models/index_catalog.py b/evadb/catalog/models/index_catalog.py index 9d111a3e4..df3317d43 100644 --- a/evadb/catalog/models/index_catalog.py +++ b/evadb/catalog/models/index_catalog.py @@ -40,6 +40,7 @@ class IndexCatalog(BaseModel): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -52,6 +53,10 @@ class IndexCatalog(BaseModel): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) `_index_def:` the original SQL statement that is used to create this index. We record this to rerun create index on updated table. ======= @@ -60,10 +65,13 @@ class IndexCatalog(BaseModel): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= `_index_def:` the original SQL statement that is used to create this index. We record this to rerun create index on updated table. @@ -82,6 +90,7 @@ class IndexCatalog(BaseModel): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -94,6 +103,10 @@ class IndexCatalog(BaseModel): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """ __tablename__ = "index_catalog" @@ -114,6 +127,7 @@ class IndexCatalog(BaseModel): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -122,6 +136,8 @@ class IndexCatalog(BaseModel): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) _index_def = Column("index_def", String, default=None) ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -140,6 +156,7 @@ class IndexCatalog(BaseModel): ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -159,6 +176,8 @@ class IndexCatalog(BaseModel): _index_def = Column("index_def", String, default=None) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) _feat_column = relationship( "ColumnCatalog", @@ -181,6 +200,7 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -189,6 +209,8 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) index_def: str = None, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -207,6 +229,7 @@ def __init__( ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -226,6 +249,8 @@ def __init__( index_def: str = None, >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ): self._name = name self._save_file_path = save_file_path @@ -241,6 +266,7 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -249,6 +275,8 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) self._index_def = index_def ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -267,6 +295,7 @@ def __init__( ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -286,6 +315,8 @@ def __init__( self._index_def = index_def >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def as_dataclass(self) -> "IndexCatalogEntry": feat_column = self._feat_column.as_dataclass() if self._feat_column else None @@ -305,6 +336,7 @@ def as_dataclass(self) -> "IndexCatalogEntry": <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -313,6 +345,8 @@ def as_dataclass(self) -> "IndexCatalogEntry": >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) index_def=self._index_def, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -331,6 +365,7 @@ def as_dataclass(self) -> "IndexCatalogEntry": ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -350,5 +385,7 @@ def as_dataclass(self) -> "IndexCatalogEntry": index_def=self._index_def, >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) feat_column=feat_column, ) diff --git a/evadb/catalog/models/utils.py b/evadb/catalog/models/utils.py index 50a26f551..f96a7b622 100644 --- a/evadb/catalog/models/utils.py +++ b/evadb/catalog/models/utils.py @@ -212,6 +212,7 @@ class IndexCatalogEntry: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -220,6 +221,8 @@ class IndexCatalogEntry: >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) index_def: str = None ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -238,6 +241,7 @@ class IndexCatalogEntry: ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -257,6 +261,8 @@ class IndexCatalogEntry: index_def: str = None >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) feat_column: ColumnCatalogEntry = None diff --git a/evadb/catalog/services/function_catalog_service.py b/evadb/catalog/services/function_catalog_service.py index 73d1abbfc..45a08a169 100644 --- a/evadb/catalog/services/function_catalog_service.py +++ b/evadb/catalog/services/function_catalog_service.py @@ -17,12 +17,17 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from typing import List ======= @@ -30,19 +35,27 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= from typing import List >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from sqlalchemy.orm import Session from sqlalchemy.sql.expression import select @@ -52,16 +65,22 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.catalog.models.utils import ( FunctionIOCatalogEntry, FunctionMetadataCatalogEntry, @@ -76,19 +95,26 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= from evadb.catalog.services.base_service import BaseService >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= from evadb.catalog.services.base_service import BaseService >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= from evadb.catalog.services.base_service import BaseService @@ -96,6 +122,8 @@ >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.utils.logging_manager import logger @@ -107,12 +135,17 @@ def __init__(self, db_session: Session): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) self._function_io_service = FunctionIOCatalogService(db_session) self._function_metadata_service = FunctionMetadataCatalogService(db_session) @@ -132,8 +165,11 @@ def insert_entry( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= self._function_io_service = FunctionIOCatalogService(db_session) self._function_metadata_service = FunctionMetadataCatalogService(db_session) @@ -148,12 +184,17 @@ def insert_entry( function_metadata_list: List[FunctionMetadataCatalogEntry], >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) -> FunctionCatalogEntry: """Insert a new function entry @@ -173,16 +214,22 @@ def insert_entry( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) for function_io in function_io_list: function_io.function_id = function_obj._row_id @@ -212,19 +259,26 @@ def insert_entry( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= return function_obj.as_dataclass() >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= return function_obj.as_dataclass() >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= return function_obj.as_dataclass() @@ -232,6 +286,8 @@ def insert_entry( >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def get_entry_by_name(self, name: str) -> FunctionCatalogEntry: """return the function entry that matches the name provided. diff --git a/evadb/catalog/services/function_io_catalog_service.py b/evadb/catalog/services/function_io_catalog_service.py index f9d071cbd..fb38da340 100644 --- a/evadb/catalog/services/function_io_catalog_service.py +++ b/evadb/catalog/services/function_io_catalog_service.py @@ -74,12 +74,17 @@ def get_output_entries_by_function_id( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def create_entries(self, io_list: List[FunctionIOCatalogEntry]): io_objs = [] ======= @@ -94,19 +99,27 @@ def insert_entries(self, io_list: List[FunctionIOCatalogEntry]): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= def create_entries(self, io_list: List[FunctionIOCatalogEntry]): io_objs = [] >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) for io in io_list: io_obj = FunctionIOCatalog( name=io.name, diff --git a/evadb/catalog/services/function_metadata_catalog_service.py b/evadb/catalog/services/function_metadata_catalog_service.py index 230a0c4d0..ecf2f3c89 100644 --- a/evadb/catalog/services/function_metadata_catalog_service.py +++ b/evadb/catalog/services/function_metadata_catalog_service.py @@ -35,12 +35,17 @@ def __init__(self, db_session: Session): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def create_entries(self, entries: List[FunctionMetadataCatalogEntry]): metadata_objs = [] ======= @@ -49,19 +54,27 @@ def insert_entries(self, entries: List[FunctionMetadataCatalogEntry]): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= def create_entries(self, entries: List[FunctionMetadataCatalogEntry]): metadata_objs = [] >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) try: for entry in entries: metadata_obj = FunctionMetadataCatalog( @@ -75,12 +88,17 @@ def create_entries(self, entries: List[FunctionMetadataCatalogEntry]): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= logger.exception( f"Failed to insert entry {entry} into function metadata catalog with exception {str(e)}" @@ -89,16 +107,22 @@ def create_entries(self, entries: List[FunctionMetadataCatalogEntry]): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) raise CatalogError(e) def get_entries_by_function_id( diff --git a/evadb/catalog/services/index_catalog_service.py b/evadb/catalog/services/index_catalog_service.py index 4d400be14..384e2a0e4 100644 --- a/evadb/catalog/services/index_catalog_service.py +++ b/evadb/catalog/services/index_catalog_service.py @@ -44,6 +44,7 @@ def insert_entry( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -56,6 +57,10 @@ def insert_entry( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) index_def: str, ) -> IndexCatalogEntry: index_entry = IndexCatalog( @@ -74,10 +79,13 @@ def insert_entry( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= index_def: str, ) -> IndexCatalogEntry: @@ -121,6 +129,7 @@ def insert_entry( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -139,6 +148,8 @@ def insert_entry( ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) index_entry = index_entry.save(self.session) return index_entry.as_dataclass() diff --git a/evadb/executor/create_function_executor.py b/evadb/executor/create_function_executor.py index dffc70b78..914b2311e 100644 --- a/evadb/executor/create_function_executor.py +++ b/evadb/executor/create_function_executor.py @@ -29,11 +29,13 @@ ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -52,6 +54,13 @@ >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) import hashlib import locale import os @@ -110,6 +119,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -139,9 +149,12 @@ ======= ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -156,6 +169,15 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +import os +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from pathlib import Path from typing import Dict, List @@ -171,6 +193,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD DEFAULT_SKLEARN_TRAIN_MODEL, ======= @@ -181,12 +204,19 @@ >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) DEFAULT_TRAIN_REGRESSION_METRIC, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= DEFAULT_TRAIN_REGRESSION_METRIC, >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) +======= + DEFAULT_TRAIN_REGRESSION_METRIC, +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) DEFAULT_TRAIN_TIME_LIMIT, DEFAULT_XGBOOST_TASK, SKLEARN_SUPPORTED_MODELS, @@ -215,6 +245,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -223,6 +254,10 @@ ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -358,6 +393,12 @@ ======= ======= ======= +<<<<<<< HEAD +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) string_comparison_case_insensitive, try_to_import_ludwig, try_to_import_neuralforecast, @@ -380,6 +421,7 @@ try_to_import_ultralytics, try_to_import_xgboost, <<<<<<< HEAD +<<<<<<< HEAD ======= ======= string_comparison_case_insensitive, @@ -407,6 +449,13 @@ >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +======= + try_to_import_ludwig, + try_to_import_torch, + try_to_import_ultralytics, +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ) from evadb.utils.logging_manager import logger @@ -460,13 +509,17 @@ def handle_huggingface_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -474,12 +527,17 @@ def handle_huggingface_function(self): >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -509,12 +567,18 @@ def handle_huggingface_function(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """Handle HuggingFace functions HuggingFace functions are special functions that are not loaded from a file. So we do not need to call the setup method on them like we do for other functions. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -522,8 +586,11 @@ def handle_huggingface_function(self): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= """Handle HuggingFace Functions @@ -540,11 +607,15 @@ def handle_huggingface_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -567,6 +638,8 @@ def handle_huggingface_function(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """Handle HuggingFace functions HuggingFace functions are special functions that are not loaded from a file. @@ -580,18 +653,25 @@ def handle_huggingface_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -629,6 +709,8 @@ def handle_huggingface_function(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """ # We need at least one deep learning framework for HuggingFace # Torch or Tensorflow @@ -667,19 +749,24 @@ def handle_ludwig_function(self): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) """Handle ludwig functions Use Ludwig's auto_train engine to train/tune models. >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -692,18 +779,23 @@ def handle_ludwig_function(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """Handle ludwig functions Use Ludwig's auto_train engine to train/tune models. ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= """Handle ludwig functions Use Ludwig's auto_train engine to train/tune models. ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """Handle ludwig Functions Use ludwig's auto_train engine to train/tune models. @@ -718,11 +810,15 @@ def handle_ludwig_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -745,6 +841,8 @@ def handle_ludwig_function(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """Handle ludwig functions Use Ludwig's auto_train engine to train/tune models. @@ -757,18 +855,25 @@ def handle_ludwig_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -806,6 +911,8 @@ def handle_ludwig_function(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """ try_to_import_ludwig() from ludwig.automl import auto_train @@ -1023,11 +1130,16 @@ def handle_ultralytics_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1048,6 +1160,8 @@ def handle_ultralytics_function(self): ======= ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) @@ -1059,6 +1173,7 @@ def handle_ultralytics_function(self): ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -1082,6 +1197,13 @@ def handle_ultralytics_function(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def handle_sklearn_function(self): """Handle sklearn functions @@ -1220,7 +1342,11 @@ def handle_ultralytics_function(self): ======= >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +<<<<<<< HEAD +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def handle_xgboost_function(self): """Handle xgboost functions @@ -1282,7 +1408,13 @@ def handle_xgboost_function(self): ======= ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +<<<<<<< HEAD +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def handle_ultralytics_function(self): <<<<<<< HEAD <<<<<<< HEAD @@ -1386,6 +1518,7 @@ def handle_ultralytics_function(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= ======= @@ -1393,10 +1526,23 @@ def handle_ultralytics_function(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= + def handle_ultralytics_function(self): + """Handle Ultralytics Functions""" +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) try_to_import_ultralytics() impl_path = ( @@ -2266,6 +2412,7 @@ def handle_generic_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -2303,6 +2450,8 @@ def handle_generic_function(self): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -2315,6 +2464,8 @@ def handle_generic_function(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= arg_map = {arg.key: arg.value for arg in self.node.metadata} @@ -2571,10 +2722,20 @@ def handle_generic_function(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """ impl_path = self.node.impl_path.absolute().as_posix() function = self._try_initializing_function(impl_path) @@ -2596,6 +2757,10 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -2611,6 +2776,9 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -2618,6 +2786,7 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -2668,6 +2837,12 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) assert ( self.node.if_not_exists and self.node.or_replace ) is False, ( @@ -2677,6 +2852,11 @@ def exec(self, *args, **kwargs): overwrite = False <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -2724,11 +2904,14 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -2737,18 +2920,22 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -2785,6 +2972,9 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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: @@ -2794,6 +2984,10 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -2809,6 +3003,9 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -2816,6 +3013,7 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -2866,6 +3064,12 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 @@ -2912,6 +3116,11 @@ def exec(self, *args, **kwargs): overwrite = True <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -2957,11 +3166,14 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -2970,18 +3182,22 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -3018,6 +3234,9 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) else: msg = f"Function {self.node.name} already exists." logger.error(msg) @@ -3047,17 +3266,22 @@ def exec(self, *args, **kwargs): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) if string_comparison_case_insensitive(self.node.function_type, "HuggingFace"): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -3070,6 +3294,8 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) if string_comparison_case_insensitive(self.node.function_type, "HuggingFace"): ======= if self.node.function_type == "HuggingFace": @@ -3091,6 +3317,9 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -3099,16 +3328,20 @@ 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= if self.node.function_type == "HuggingFace": >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -3160,6 +3393,9 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ( name, impl_path, @@ -3190,17 +3426,22 @@ def exec(self, *args, **kwargs): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) elif string_comparison_case_insensitive(self.node.function_type, "ultralytics"): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -3213,6 +3454,8 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) elif string_comparison_case_insensitive(self.node.function_type, "ultralytics"): ======= elif self.node.function_type == "ultralytics": @@ -3234,6 +3477,9 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -3242,16 +3488,20 @@ 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= elif self.node.function_type == "ultralytics": >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -3303,6 +3553,9 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ( name, impl_path, @@ -3333,17 +3586,22 @@ def exec(self, *args, **kwargs): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) elif string_comparison_case_insensitive(self.node.function_type, "Ludwig"): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -3356,6 +3614,8 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) elif string_comparison_case_insensitive(self.node.function_type, "Ludwig"): ======= elif self.node.function_type == "Ludwig": @@ -3377,6 +3637,9 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -3385,16 +3648,20 @@ 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= elif self.node.function_type == "Ludwig": >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -3446,6 +3713,9 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ( name, impl_path, @@ -3461,6 +3731,10 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD ======= ======= @@ -3477,6 +3751,7 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -3494,6 +3769,8 @@ def exec(self, *args, **kwargs): ======= ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD @@ -3509,6 +3786,7 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -3525,6 +3803,13 @@ def exec(self, *args, **kwargs): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) elif string_comparison_case_insensitive(self.node.function_type, "Sklearn"): ( name, @@ -3580,6 +3865,11 @@ def exec(self, *args, **kwargs): ) = self.handle_forecasting_function() <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -3604,6 +3894,7 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -3620,6 +3911,7 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= @@ -3642,12 +3934,15 @@ def exec(self, *args, **kwargs): ======= <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -3690,6 +3985,9 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) else: ( name, @@ -3705,6 +4003,10 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -3720,6 +4022,9 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -3727,6 +4032,7 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -3777,6 +4083,12 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) if overwrite: msg = f"Function {self.node.name} overwritten." @@ -3800,6 +4112,11 @@ def exec(self, *args, **kwargs): yield Batch(pd.DataFrame([msg])) <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -3846,6 +4163,8 @@ def exec(self, *args, **kwargs): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= yield Batch( pd.DataFrame( @@ -3861,6 +4180,7 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD yield Batch(pd.DataFrame([msg])) @@ -3899,6 +4219,8 @@ def exec(self, *args, **kwargs): ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -3916,6 +4238,7 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -3932,6 +4255,15 @@ def exec(self, *args, **kwargs): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def _try_initializing_function( self, impl_path: str, function_args: Dict = {} @@ -3951,13 +4283,17 @@ def _try_initializing_function( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -3965,12 +4301,17 @@ def _try_initializing_function( >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -4000,6 +4341,9 @@ def _try_initializing_function( >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) function_args (Dict, optional): Dictionary of arguments to pass to the function. Defaults to {}. Returns: @@ -4009,6 +4353,9 @@ def _try_initializing_function( RuntimeError: If an error occurs while initializing the function. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4047,6 +4394,9 @@ def _try_initializing_function( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= ======= @@ -4069,12 +4419,16 @@ def _try_initializing_function( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= function_args (Dict, optional): Dictionary of arguments to pass to the Function. Defaults to {}. +<<<<<<< HEAD ======= function_args (Dict, optional): Dictionary of arguments to pass to the function. Defaults to {}. >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -4176,6 +4530,17 @@ def _try_initializing_function( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (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)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """ # load the function class from the file @@ -4208,17 +4573,22 @@ def _try_initializing_function( >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) err_msg = f"Error creating function {self.node.name}: {str(e)}" >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -4231,6 +4601,8 @@ def _try_initializing_function( ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) err_msg = f"Error creating function {self.node.name}: {str(e)}" ======= err_msg = f"Error creating Function: {str(e)}" @@ -4252,6 +4624,9 @@ def _try_initializing_function( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -4260,16 +4635,20 @@ def _try_initializing_function( >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= err_msg = f"Error creating Function: {str(e)}" >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -4321,6 +4700,9 @@ def _try_initializing_function( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # logger.error(err_msg) raise RuntimeError(err_msg) @@ -4352,17 +4734,22 @@ def _resolve_function_io( >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) """Private method that resolves the input/output definitions for a given function. >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -4375,6 +4762,8 @@ def _resolve_function_io( ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """Private method that resolves the input/output definitions for a given function. ======= """Private method that resolves the input/output definitions for a given Function. @@ -4396,6 +4785,9 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -4404,16 +4796,20 @@ def _resolve_function_io( >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= """Private method that resolves the input/output definitions for a given Function. >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -4465,6 +4861,9 @@ def _resolve_function_io( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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: @@ -4495,17 +4894,22 @@ def _resolve_function_io( >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) output definitions for the function. >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -4518,6 +4922,8 @@ def _resolve_function_io( ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) output definitions for the function. ======= output definitions for the Function. @@ -4539,6 +4945,9 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -4547,16 +4956,20 @@ def _resolve_function_io( >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= output definitions for the Function. >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -4608,6 +5021,9 @@ def _resolve_function_io( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Raises: RuntimeError: If an error occurs while resolving the function input/output @@ -4656,17 +5072,22 @@ def _resolve_function_io( >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) f"Error creating function, input/output definition incorrect: {str(e)}" >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -4679,6 +5100,8 @@ def _resolve_function_io( ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) f"Error creating function, input/output definition incorrect: {str(e)}" ======= f"Error creating Function, input/output definition incorrect: {str(e)}" @@ -4700,6 +5123,9 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -4708,16 +5134,20 @@ def _resolve_function_io( >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= f"Error creating Function, input/output definition incorrect: {str(e)}" >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -4769,6 +5199,9 @@ def _resolve_function_io( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) logger.error(err_msg) raise RuntimeError(err_msg) diff --git a/evadb/executor/create_index_executor.py b/evadb/executor/create_index_executor.py index b647a586e..016a633c2 100644 --- a/evadb/executor/create_index_executor.py +++ b/evadb/executor/create_index_executor.py @@ -278,6 +278,7 @@ def _create_evadb_index(self): # Get feature tables. feat_tb_catalog_entry = self.table_ref.table.table_obj +<<<<<<< HEAD # Get feature column. feat_col_name = self.col_list[0].name feat_col_catalog_entry = [ @@ -308,6 +309,21 @@ def _create_evadb_index(self): self.vector_store_type, index_path ), ) +======= + # Add features to index. + # TODO: batch size is hardcoded for now. + input_dim = -1 + storage_engine = StorageEngine.factory(self.db, feat_catalog_entry) + for input_batch in storage_engine.read(feat_catalog_entry): + if self.node.function: + # Create index through function expression. + # Function(input column) -> 2 dimension feature vector. + input_batch.modify_column_alias(feat_catalog_entry.name.lower()) + feat_batch = self.node.function.evaluate(input_batch) + feat_batch.drop_column_alias() + input_batch.drop_column_alias() + feat = feat_batch.column_as_numpy_array("features") +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) else: # Skip index update if CREATE INDEX runs on a different index. logger.warn(msg) @@ -723,16 +739,22 @@ def _create_evadb_index(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> da04707f (feat: insertion update index (#1246)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= >>>>>>> da04707f (feat: insertion update index (#1246)) >>>>>>> a590a82c (feat: insertion update index (#1246)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) if index_catalog_entry is None: self.catalog().insert_index_catalog_entry( self.name, @@ -746,8 +768,11 @@ def _create_evadb_index(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a590a82c (feat: insertion update index (#1246)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= self.catalog().insert_index_catalog_entry( self.node.name, @@ -763,10 +788,14 @@ def _create_evadb_index(self): ======= >>>>>>> da04707f (feat: insertion update index (#1246)) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= self.catalog().insert_index_catalog_entry( self.node.name, +<<<<<<< HEAD index_path, self.node.vector_store_type, feat_column, @@ -793,6 +822,15 @@ def _create_evadb_index(self): >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> a590a82c (feat: insertion update index (#1246)) +======= + self.index_path, + self.node.vector_store_type, + feat_column, + self.node.function.signature() if self.node.function else None, + ) +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) except Exception as e: # Delete index. if index: diff --git a/evadb/executor/create_udf_executor.py b/evadb/executor/create_udf_executor.py index 9ccc26117..79dd791ed 100644 --- a/evadb/executor/create_udf_executor.py +++ b/evadb/executor/create_udf_executor.py @@ -23,10 +23,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 065f25fb (release: merge staging into master (#1032)) @@ -45,6 +49,8 @@ ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) import hashlib import os import pickle @@ -110,8 +116,19 @@ ======= ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +import hashlib +import os +import pickle +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from pathlib import Path from typing import Dict, List @@ -145,10 +162,13 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) try_to_import_forecast, ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -165,11 +185,15 @@ >>>>>>> 7dd70375 (release: merge staging into master (#1032)) >>>>>>> f028c383 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) try_to_import_forecast, ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) @@ -177,6 +201,7 @@ try_to_import_forecast, >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -210,6 +235,9 @@ >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) try_to_import_ludwig, try_to_import_torch, try_to_import_ultralytics, @@ -255,12 +283,15 @@ def handle_ludwig_udf(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (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. @@ -272,6 +303,7 @@ def handle_ludwig_udf(self): >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -280,18 +312,26 @@ def handle_ludwig_udf(self): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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. >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= Use Ludwig's auto_train engine to train/tune models. >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -328,6 +368,9 @@ def handle_ludwig_udf(self): ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) """ try_to_import_ludwig() from ludwig.automl import auto_train @@ -397,17 +440,24 @@ def handle_ultralytics_udf(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -433,6 +483,8 @@ def handle_ultralytics_udf(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def handle_forecasting_udf(self): """Handle forecasting UDFs""" aggregated_batch_list = [] @@ -555,11 +607,14 @@ def handle_forecasting_udf(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -572,6 +627,7 @@ def handle_forecasting_udf(self): >>>>>>> 7dd70375 (release: merge staging into master (#1032)) >>>>>>> f028c383 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -610,6 +666,14 @@ def handle_forecasting_udf(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> 7dd70375 (release: merge staging into master (#1032)) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def handle_generic_udf(self): """Handle generic UDFs @@ -661,12 +725,15 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) elif self.node.udf_type == "Forecasting": name, impl_path, udf_type, io_list, metadata = self.handle_forecasting_udf() ======= @@ -684,6 +751,7 @@ def exec(self, *args, **kwargs): ======= ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= @@ -691,12 +759,17 @@ def exec(self, *args, **kwargs): ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) elif self.node.udf_type == "Forecasting": name, impl_path, udf_type, io_list, metadata = self.handle_forecasting_udf() ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= @@ -704,6 +777,7 @@ def exec(self, *args, **kwargs): name, impl_path, udf_type, io_list, metadata = self.handle_forecasting_udf() >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -738,6 +812,9 @@ def exec(self, *args, **kwargs): ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 312f7aaaa..e5f41df27 100644 --- a/evadb/executor/drop_object_executor.py +++ b/evadb/executor/drop_object_executor.py @@ -47,10 +47,14 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD elif self.node.object_type == ObjectType.DATABASE: @@ -94,11 +98,14 @@ def exec(self, *args, **kwargs): >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (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)) +<<<<<<< HEAD ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -106,9 +113,16 @@ def exec(self, *args, **kwargs): yield self._handle_drop_database(self.node.name, self.node.if_exists) ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (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 901e79987..ad6bbed27 100644 --- a/evadb/functions/chatgpt.py +++ b/evadb/functions/chatgpt.py @@ -106,17 +106,22 @@ def name(self) -> str: >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) @setup(cacheable=True, function_type="chat-completion", batchable=True) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -129,6 +134,8 @@ def name(self) -> str: ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @setup(cacheable=True, function_type="chat-completion", batchable=True) ======= @setup(cacheable=False, function_type="chat-completion", batchable=True) @@ -150,6 +157,9 @@ def name(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -158,16 +168,20 @@ def name(self) -> str: >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= @setup(cacheable=False, function_type="chat-completion", batchable=True) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -219,6 +233,9 @@ def name(self) -> str: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 af4b0324f..8b94de9ee 100644 --- a/evadb/functions/forecast.py +++ b/evadb/functions/forecast.py @@ -33,13 +33,17 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -47,12 +51,17 @@ >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -82,6 +91,9 @@ >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.functions.abstract.abstract_function import AbstractFunction from evadb.functions.decorators.decorators import setup @@ -89,6 +101,9 @@ class ForecastModel(AbstractFunction): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -96,9 +111,12 @@ class ForecastModel(AbstractFunction): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= from evadb.catalog.catalog_type import NdArrayType from evadb.udfs.abstract.abstract_udf import AbstractUDF from evadb.udfs.decorators.decorators import forward, setup @@ -117,11 +135,15 @@ class ForecastModel(AbstractUDF): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -144,6 +166,8 @@ class ForecastModel(AbstractUDF): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.functions.abstract.abstract_function import AbstractFunction from evadb.functions.decorators.decorators import setup @@ -158,18 +182,25 @@ class ForecastModel(AbstractFunction): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -207,6 +238,8 @@ class ForecastModel(AbstractFunction): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @property def name(self) -> str: return "ForecastModel" @@ -214,6 +247,10 @@ def name(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -229,6 +266,9 @@ def name(self) -> str: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -236,6 +276,7 @@ def name(self) -> str: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -286,6 +327,12 @@ def name(self) -> str: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @setup(cacheable=False, function_type="Forecasting", batchable=True) def setup( self, @@ -305,7 +352,11 @@ def setup( library: str, ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +<<<<<<< HEAD +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ): >>>>>>> ae08f806 (Bump v0.3.4+ dev) <<<<<<< HEAD @@ -502,7 +553,9 @@ def setup(self, model_name: str, model_path: str): library: str, ): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -529,6 +582,16 @@ def setup(self, model_name: str, model_path: str): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= + @setup(cacheable=False, udf_type="Forecasting", batchable=True) + def setup(self, model_name: str, model_path: str): +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) f = open(model_path, "rb") loaded_model = pickle.load(f) f.close() @@ -542,6 +605,7 @@ def setup(self, model_name: str, model_path: str): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -552,6 +616,10 @@ def setup(self, model_name: str, model_path: str): ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -853,6 +921,12 @@ def forward(self, data) -> pd.DataFrame: >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (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 @@ -889,6 +963,7 @@ def forward(self, data) -> pd.DataFrame: <<<<<<< HEAD )[: self.horizon * forecast_df["unique_id"].nunique()] ======= +<<<<<<< HEAD <<<<<<< HEAD ) <<<<<<< HEAD @@ -926,18 +1001,40 @@ def forward(self, data) -> pd.DataFrame: ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) def forward(self, data) -> pd.DataFrame: <<<<<<< HEAD +======= +======= + + @forward( + input_signatures=[], + output_signatures=[ + PandasDataframe( + columns=["y"], + column_types=[ + NdArrayType.FLOAT32, + ], + column_shapes=[(None,)], + ) + ], + ) + def forward(self, data) -> pd.DataFrame: +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) 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)) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) forecast_df = forecast_df.rename(columns={self.model_name: "y"}) return pd.DataFrame( forecast_df, @@ -949,12 +1046,15 @@ def forward(self, data) -> pd.DataFrame: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= if self.library == "statsforecast": forecast_df = self.model.predict(h=self.horizon) @@ -979,9 +1079,20 @@ def forward(self, data) -> pd.DataFrame: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= ======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= )[: self.horizon * forecast_df["unique_id"].nunique()] return forecast_df >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/evadb/functions/function_bootstrap_queries.py b/evadb/functions/function_bootstrap_queries.py index 25fc4ae12..6629969ab 100644 --- a/evadb/functions/function_bootstrap_queries.py +++ b/evadb/functions/function_bootstrap_queries.py @@ -52,6 +52,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -67,6 +71,9 @@ >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -74,6 +81,7 @@ >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -124,6 +132,12 @@ >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) DummyNoInputFunction_function_query = """CREATE FUNCTION IF NOT EXISTS DummyNoInputFunction IMPL '{}/../test/util.py'; @@ -140,6 +154,11 @@ <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -185,11 +204,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -198,18 +220,22 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -246,6 +272,9 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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)) @@ -395,10 +424,13 @@ EvaDB_INSTALLATION_DIR ) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2b924b76 (Add stable diffusion integration (#1240)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) dalle_function_query = """CREATE FUNCTION IF NOT EXISTS DallE IMPL '{}/functions/dalle.py'; """.format( @@ -471,17 +503,22 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) Args:G >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -494,6 +531,8 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Args:G ======= Args: @@ -515,6 +554,9 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -523,16 +565,20 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= Args: >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -584,6 +630,9 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) mode (str, optional): The mode for loading functions, either 'debug' or 'release'. Defaults to 'debug'. @@ -624,6 +673,11 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) stablediffusion_function_query, dalle_function_query, Upper_function_query, @@ -631,11 +685,13 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: Concat_function_query, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= stablediffusion_function_query, dalle_function_query, >>>>>>> 2b924b76 (Add stable diffusion integration (#1240)) ======= +<<<<<<< HEAD ======= >>>>>>> 8a8a90aa (Add stable diffusion integration (#1240)) stablediffusion_function_query, @@ -656,6 +712,9 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: dalle_function_query, >>>>>>> 2b924b76 (Add stable diffusion integration (#1240)) >>>>>>> 8a8a90aa (Add stable diffusion integration (#1240)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ] # if mode is 'debug', add debug functions @@ -688,18 +747,23 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) DummyNoInputFunction_function_query, DummyLLM_function_query, >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -712,6 +776,8 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) DummyNoInputFunction_function_query, DummyLLM_function_query, ======= @@ -751,13 +817,17 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -765,11 +835,15 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -805,6 +879,9 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ] ) diff --git a/evadb/optimizer/operators.py b/evadb/optimizer/operators.py index 5d8753e60..d6c37bd59 100644 --- a/evadb/optimizer/operators.py +++ b/evadb/optimizer/operators.py @@ -41,15 +41,20 @@ >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) from evadb.catalog.models.utils import IndexCatalogEntry >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -58,6 +63,8 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.catalog.models.utils import IndexCatalogEntry ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -72,11 +79,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= from evadb.catalog.models.utils import IndexCatalogEntry ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -86,17 +96,21 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -135,6 +149,9 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 @@ -765,13 +782,17 @@ class LogicalCreateFunction(Operator): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -779,12 +800,17 @@ class LogicalCreateFunction(Operator): >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -814,12 +840,18 @@ class LogicalCreateFunction(Operator): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) or_replace: bool if true should overwrite if function with same name exists if_not_exists: bool if true should skip if function with same name exists <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -827,8 +859,11 @@ class LogicalCreateFunction(Operator): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= if_not_exists: bool if true should throw an error if function with same name exists @@ -844,11 +879,15 @@ class LogicalCreateFunction(Operator): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -871,6 +910,8 @@ class LogicalCreateFunction(Operator): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) or_replace: bool if true should overwrite if function with same name exists if_not_exists: bool @@ -884,18 +925,25 @@ class LogicalCreateFunction(Operator): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -933,6 +981,8 @@ class LogicalCreateFunction(Operator): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) inputs: List[FunctionIOCatalogEntry] function inputs, annotated list similar to table columns outputs: List[FunctionIOCatalogEntry] @@ -1391,6 +1441,7 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1403,6 +1454,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) project_expr_list: List[AbstractExpression], index_def: str, ======= @@ -1412,10 +1467,13 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= project_expr_list: List[AbstractExpression], index_def: str, @@ -1434,6 +1492,7 @@ def __init__( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1446,6 +1505,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) children: List = None, ): super().__init__(OperatorType.LOGICALCREATEINDEX, children) @@ -1463,6 +1526,7 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1475,6 +1539,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) self._project_expr_list = project_expr_list self._index_def = index_def ======= @@ -1484,10 +1552,13 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= self._project_expr_list = project_expr_list self._index_def = index_def @@ -1506,6 +1577,7 @@ def __init__( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1518,6 +1590,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @property def name(self): @@ -1549,16 +1625,20 @@ def vector_store_type(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1575,6 +1655,10 @@ def vector_store_type(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def project_expr_list(self): return self._project_expr_list @@ -1589,6 +1673,7 @@ def index_def(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1601,6 +1686,10 @@ def index_def(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= def function(self): return self._function @@ -1609,12 +1698,16 @@ def function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1631,6 +1724,10 @@ def function(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def __eq__(self, other): is_subtree_equal = super().__eq__(other) @@ -1652,6 +1749,7 @@ def __eq__(self, other): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1664,6 +1762,10 @@ def __eq__(self, other): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) and self.project_expr_list == other.project_expr_list and self.index_def == other.index_def ======= @@ -1673,10 +1775,13 @@ def __eq__(self, other): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= and self.project_expr_list == other.project_expr_list and self.index_def == other.index_def @@ -1695,6 +1800,7 @@ def __eq__(self, other): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1707,6 +1813,10 @@ def __eq__(self, other): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) def __hash__(self) -> int: @@ -1727,6 +1837,7 @@ def __hash__(self) -> int: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1739,6 +1850,10 @@ def __hash__(self) -> int: >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) tuple(self.project_expr_list), self.index_def, ======= @@ -1748,10 +1863,13 @@ def __hash__(self) -> int: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= tuple(self.project_expr_list), self.index_def, @@ -1770,6 +1888,7 @@ def __hash__(self) -> int: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1782,6 +1901,10 @@ def __hash__(self) -> int: >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) ) diff --git a/evadb/optimizer/optimizer_utils.py b/evadb/optimizer/optimizer_utils.py index 49d54e69b..5da299761 100644 --- a/evadb/optimizer/optimizer_utils.py +++ b/evadb/optimizer/optimizer_utils.py @@ -310,6 +310,10 @@ def check_expr_validity_for_cache(expr: FunctionExpression): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -325,6 +329,9 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -332,6 +339,7 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -382,6 +390,12 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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. @@ -394,6 +408,11 @@ def check_expr_validity_for_cache(expr: FunctionExpression): return valid <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -415,6 +434,7 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -437,6 +457,10 @@ def check_expr_validity_for_cache(expr: FunctionExpression): ======= ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) return ( expr.name in CACHEABLE_FUNCTIONS and not expr.has_cache() @@ -454,11 +478,14 @@ def check_expr_validity_for_cache(expr: FunctionExpression): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -471,6 +498,7 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -479,11 +507,16 @@ def check_expr_validity_for_cache(expr: FunctionExpression): ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -522,6 +555,9 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 bed9a6ab6..d5a1b81d4 100644 --- a/evadb/optimizer/rules/rules.py +++ b/evadb/optimizer/rules/rules.py @@ -37,15 +37,20 @@ >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) from evadb.catalog.models.utils import IndexCatalogEntry >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -54,6 +59,8 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.catalog.models.utils import IndexCatalogEntry ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -68,11 +75,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= from evadb.catalog.models.utils import IndexCatalogEntry ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -82,17 +92,21 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -131,6 +145,9 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.constants import CACHEABLE_FUNCTIONS from evadb.executor.execution_context import Context from evadb.expression.expression_utils import ( @@ -694,13 +711,17 @@ def _exists_predicate(opr): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -708,11 +729,16 @@ def _exists_predicate(opr): >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -742,6 +768,9 @@ def _exists_predicate(opr): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # Only check the index existence when building on EvaDB data. if not is_postgres_data_source: @@ -781,6 +810,7 @@ def _exists_predicate(opr): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -798,6 +828,10 @@ def _exists_predicate(opr): ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) # Only check the index existence when building on EvaDB data. @@ -810,6 +844,7 @@ def _exists_predicate(opr): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -853,6 +888,8 @@ def _exists_predicate(opr): else base_func_expr.signature() ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -865,6 +902,18 @@ def _exists_predicate(opr): None if isinstance(base_func_expr, TupleValueExpression) else base_func_expr.signature() +======= +<<<<<<< HEAD +======= + + # 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)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ) # Get index catalog. Check if an index exists for matching @@ -1255,6 +1304,7 @@ def apply(self, before: LogicalCreateIndex, context: OptimizerContext): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD before.project_expr_list, before.index_def, @@ -1274,11 +1324,16 @@ def apply(self, before: LogicalCreateIndex, context: OptimizerContext): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) before.project_expr_list, before.index_def, ======= before.function, >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= before.project_expr_list, before.index_def, @@ -1287,6 +1342,8 @@ def apply(self, before: LogicalCreateIndex, context: OptimizerContext): before.project_expr_list, before.index_def, >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ) child = SeqScanPlan(None, before.project_expr_list, before.table_ref.alias) batch_mem_size = context.db.config.get_value("executor", "batch_mem_size") diff --git a/evadb/optimizer/statement_to_opr_converter.py b/evadb/optimizer/statement_to_opr_converter.py index 3b43d6158..497766aea 100644 --- a/evadb/optimizer/statement_to_opr_converter.py +++ b/evadb/optimizer/statement_to_opr_converter.py @@ -78,9 +78,11 @@ >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) @@ -94,6 +96,13 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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) @@ -148,13 +157,17 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -162,6 +175,9 @@ >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= from evadb.parser.table_ref import TableRef @@ -169,6 +185,7 @@ >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -200,6 +217,9 @@ >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.utils.logging_manager import logger @@ -516,6 +536,7 @@ def visit_create_index(self, statement: CreateIndexStatement): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -528,6 +549,10 @@ def visit_create_index(self, statement: CreateIndexStatement): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) statement.project_expr_list, statement.index_def, ======= @@ -537,10 +562,13 @@ def visit_create_index(self, statement: CreateIndexStatement): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= statement.project_expr_list, statement.index_def, @@ -559,6 +587,7 @@ def visit_create_index(self, statement: CreateIndexStatement): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -571,6 +600,10 @@ def visit_create_index(self, statement: CreateIndexStatement): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) self._plan = create_index_opr diff --git a/evadb/parser/create_function_statement.py b/evadb/parser/create_function_statement.py index 8c880f48b..20f51bed8 100644 --- a/evadb/parser/create_function_statement.py +++ b/evadb/parser/create_function_statement.py @@ -73,6 +73,10 @@ def __str__(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -88,6 +92,9 @@ def __str__(self) -> str: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -95,6 +102,7 @@ def __str__(self) -> str: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -145,6 +153,12 @@ def __str__(self) -> str: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) s = "CREATE" if self._or_replace: @@ -153,6 +167,11 @@ def __str__(self) -> str: s += " " + "FUNCTION" <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -199,6 +218,7 @@ def __str__(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -217,12 +237,18 @@ def __str__(self) -> str: ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> eva-master +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= s = "CREATE FUNCTION" >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -263,6 +289,14 @@ def __str__(self) -> str: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) if self._if_not_exists: s += " IF NOT EXISTS" diff --git a/evadb/parser/create_index_statement.py b/evadb/parser/create_index_statement.py index cea51d1a6..377f6eac2 100644 --- a/evadb/parser/create_index_statement.py +++ b/evadb/parser/create_index_statement.py @@ -41,6 +41,7 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -53,6 +54,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) project_expr_list: List[AbstractStatement], ======= function: FunctionExpression = None, @@ -61,6 +66,9 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= project_expr_list: List[AbstractStatement], >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -69,6 +77,7 @@ def __init__( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -87,6 +96,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ): super().__init__(StatementType.CREATE_INDEX) self._name = name @@ -103,16 +116,20 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -129,6 +146,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) self._project_expr_list = project_expr_list # Definition of CREATE INDEX. @@ -259,6 +280,7 @@ def traverse_create_function_expression_str(expr): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master @@ -350,12 +372,33 @@ def __str__(self) -> str: <<<<<<< HEAD <<<<<<< HEAD ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 277161e7 (feat: create index from projection (#1244)) +<<<<<<< HEAD >>>>>>> a6ef863c (feat: create index from projection (#1244)) +<<<<<<< HEAD >>>>>>> a747c7e3 (feat: create index from projection (#1244)) +======= +======= +======= +======= + self._function = function + + def __str__(self) -> str: + print_str = "CREATE INDEX {} ON {} ({}{}) ".format( + self._name, + self._table_ref, + "" if self._function else self._function, + tuple(self._col_list), + ) +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) return print_str @property @@ -388,16 +431,20 @@ def vector_store_type(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -414,6 +461,10 @@ def vector_store_type(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def project_expr_list(self): return self._project_expr_list @@ -432,6 +483,7 @@ def index_def(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -444,6 +496,10 @@ def index_def(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= def function(self): return self._function @@ -452,12 +508,16 @@ def function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -474,6 +534,10 @@ def function(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def __eq__(self, other): if not isinstance(other, CreateIndexStatement): @@ -493,6 +557,7 @@ def __eq__(self, other): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -505,6 +570,10 @@ def __eq__(self, other): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) and self._project_expr_list == other.project_expr_list and self._index_def == other.index_def ======= @@ -514,10 +583,13 @@ def __eq__(self, other): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= and self._project_expr_list == other.project_expr_list and self._index_def == other.index_def @@ -536,6 +608,7 @@ def __eq__(self, other): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -548,6 +621,10 @@ def __eq__(self, other): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) def __hash__(self) -> int: @@ -568,6 +645,7 @@ def __hash__(self) -> int: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -580,6 +658,10 @@ def __hash__(self) -> int: >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) tuple(self._project_expr_list), self._index_def, ======= @@ -589,10 +671,13 @@ def __hash__(self) -> int: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= tuple(self._project_expr_list), self._index_def, @@ -611,6 +696,7 @@ def __hash__(self) -> int: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -623,5 +709,9 @@ def __hash__(self) -> int: >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) ) diff --git a/evadb/parser/evadb.lark b/evadb/parser/evadb.lark index d1f442ab5..7f030ca80 100644 --- a/evadb/parser/evadb.lark +++ b/evadb/parser/evadb.lark @@ -62,6 +62,10 @@ rename_table: RENAME TABLE table_name TO table_name <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -77,6 +81,9 @@ rename_table: RENAME TABLE table_name TO table_name >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -84,6 +91,7 @@ rename_table: RENAME TABLE table_name TO table_name >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -134,12 +142,23 @@ rename_table: RENAME TABLE table_name TO table_name >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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* | CREATE or_replace? FUNCTION if_not_exists? function_name FROM LR_BRACKET select_statement RR_BRACKET TYPE function_type function_metadata* <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -161,6 +180,7 @@ create_function: CREATE or_replace? FUNCTION if_not_exists? function_name INPUT >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -183,6 +203,10 @@ create_function: CREATE or_replace? FUNCTION if_not_exists? function_name INPUT ======= ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (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* @@ -198,11 +222,14 @@ create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_defin <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -215,6 +242,7 @@ create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_defin >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -223,11 +251,16 @@ create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_defin ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -266,6 +299,9 @@ create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_defin >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) // Details function_name: uid @@ -585,17 +621,22 @@ function_call: function ->function_call >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) function: simple_id "(" (STAR | function_args)? ")" dotted_id? >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -608,6 +649,8 @@ function: simple_id "(" (STAR | function_args)? ")" dotted_id? ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) function: simple_id "(" (STAR | function_args)? ")" dotted_id? ======= function: simple_id "(" (STAR | function_args) ")" dotted_id? @@ -629,6 +672,9 @@ function: simple_id "(" (STAR | function_args)? ")" dotted_id? <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -637,16 +683,20 @@ function: simple_id "(" (STAR | function_args)? ")" dotted_id? >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= function: simple_id "(" (STAR | function_args) ")" dotted_id? >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -698,6 +748,9 @@ function: simple_id "(" (STAR | function_args)? ")" dotted_id? >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 3110e3350..bd9027d77 100644 --- a/evadb/parser/lark_visitor/_create_statements.py +++ b/evadb/parser/lark_visitor/_create_statements.py @@ -267,10 +267,14 @@ def create_index(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -285,6 +289,8 @@ def create_index(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # Projection list of child of index creation. project_expr_list = [] @@ -296,11 +302,14 @@ def create_index(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= # Projection list of child of index creation. project_expr_list = [] @@ -318,6 +327,7 @@ def create_index(self, tree): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -360,6 +370,16 @@ def create_index(self, tree): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +======= + # Parse either a single function call or column list. + col_list, function = None, None + if not isinstance(index_elem, list): + function = index_elem +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # Traverse to the tuple value expression. while not isinstance(index_elem, TupleValueExpression): @@ -376,6 +396,7 @@ def create_index(self, tree): return CreateIndexStatement( <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -412,6 +433,7 @@ def create_index(self, tree): ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -445,6 +467,9 @@ def create_index(self, tree): >>>>>>> 277161e7 (feat: create index from projection (#1244)) >>>>>>> a6ef863c (feat: create index from projection (#1244)) >>>>>>> a747c7e3 (feat: create index from projection (#1244)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) index_name, if_not_exists, table_ref, @@ -458,10 +483,13 @@ def create_index(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> a747c7e3 (feat: create index from projection (#1244)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= index_name, table_ref, col_list, vector_store_type, function >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -512,6 +540,9 @@ def create_index(self, tree): >>>>>>> 277161e7 (feat: create index from projection (#1244)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> a6ef863c (feat: create index from projection (#1244)) ======= ======= @@ -520,6 +551,7 @@ def create_index(self, tree): >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -576,6 +608,9 @@ def create_index(self, tree): ======= >>>>>>> a6ef863c (feat: create index from projection (#1244)) >>>>>>> a747c7e3 (feat: create index from projection (#1244)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 97870a6ee..f5159541b 100644 --- a/evadb/parser/lark_visitor/_drop_statement.py +++ b/evadb/parser/lark_visitor/_drop_statement.py @@ -62,6 +62,10 @@ def drop_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -77,6 +81,9 @@ def drop_function(self, tree): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -84,6 +91,7 @@ def drop_function(self, tree): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -134,6 +142,12 @@ def drop_function(self, tree): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # Drop Database def drop_database(self, tree): @@ -150,6 +164,11 @@ def drop_database(self, tree): return DropObjectStatement(ObjectType.DATABASE, database_name, if_exists) <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -209,11 +228,14 @@ def drop_job(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -222,18 +244,22 @@ def drop_job(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -270,3 +296,6 @@ def drop_job(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/evadb/parser/lark_visitor/_functions.py b/evadb/parser/lark_visitor/_functions.py index bd2d6288e..7ff2b73a2 100644 --- a/evadb/parser/lark_visitor/_functions.py +++ b/evadb/parser/lark_visitor/_functions.py @@ -53,17 +53,22 @@ def function(self, tree): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) function_args = [] >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -76,6 +81,8 @@ def function(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) function_args = [] ======= function_args = None @@ -97,6 +104,9 @@ def function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -105,16 +115,20 @@ def function(self, tree): >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= function_args = None >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -166,6 +180,9 @@ def function(self, tree): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) for child in tree.children: if isinstance(child, Token): @@ -214,15 +231,20 @@ def create_function(self, tree): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) or_replace = False >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -231,6 +253,8 @@ def create_function(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) or_replace = False ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -245,10 +269,13 @@ def create_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= or_replace = False ======= @@ -259,17 +286,21 @@ def create_function(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -308,6 +339,9 @@ def create_function(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) if_not_exists = False input_definitions = [] output_definitions = [] @@ -344,18 +378,23 @@ def create_function(self, tree): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) elif child.data == "or_replace": or_replace = True >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -368,6 +407,8 @@ def create_function(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) elif child.data == "or_replace": or_replace = True ======= @@ -407,13 +448,17 @@ def create_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -421,11 +466,15 @@ def create_function(self, tree): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -461,6 +510,9 @@ def create_function(self, tree): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) elif child.data == "if_not_exists": if_not_exists = True elif child.data == "create_definitions": @@ -510,15 +562,20 @@ def create_function(self, tree): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) or_replace, >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -527,6 +584,8 @@ def create_function(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) or_replace, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -541,10 +600,13 @@ def create_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= or_replace, ======= @@ -555,17 +617,21 @@ def create_function(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -604,6 +670,9 @@ def create_function(self, tree): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 a9c5aebf7..8948f1240 100644 --- a/evadb/plan_nodes/create_function_plan.py +++ b/evadb/plan_nodes/create_function_plan.py @@ -39,13 +39,17 @@ class CreateFunctionPlan(AbstractPlan): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -53,12 +57,17 @@ class CreateFunctionPlan(AbstractPlan): >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -88,12 +97,18 @@ class CreateFunctionPlan(AbstractPlan): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) or_replace: bool if true should overwrite if function with same name exists if_not_exists: bool if true should skip if function with same name exists <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -101,8 +116,11 @@ class CreateFunctionPlan(AbstractPlan): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= if_not_exists: bool if true should throw an error if function with same name exists @@ -118,11 +136,15 @@ class CreateFunctionPlan(AbstractPlan): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -145,6 +167,8 @@ class CreateFunctionPlan(AbstractPlan): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) or_replace: bool if true should overwrite if function with same name exists if_not_exists: bool @@ -158,18 +182,25 @@ class CreateFunctionPlan(AbstractPlan): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -207,6 +238,8 @@ class CreateFunctionPlan(AbstractPlan): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) inputs: List[FunctionIOCatalogEntry] function inputs, annotated list similar to table columns outputs: List[FunctionIOCatalogEntry] @@ -291,15 +324,20 @@ def __str__(self): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) or_replace={}, \ >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -308,6 +346,8 @@ def __str__(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) or_replace={}, \ ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -322,10 +362,13 @@ def __str__(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= or_replace={}, \ ======= @@ -336,17 +379,21 @@ def __str__(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -385,6 +432,9 @@ def __str__(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) if_not_exists={}, \ inputs={}, \ outputs={}, \ diff --git a/evadb/plan_nodes/create_index_plan.py b/evadb/plan_nodes/create_index_plan.py index 1e465ee9f..dab282c1d 100644 --- a/evadb/plan_nodes/create_index_plan.py +++ b/evadb/plan_nodes/create_index_plan.py @@ -40,6 +40,7 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -52,6 +53,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) project_expr_list: List[AbstractExpression], index_def: str, ======= @@ -61,10 +66,13 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= project_expr_list: List[AbstractExpression], index_def: str, @@ -83,6 +91,7 @@ def __init__( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -95,6 +104,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ): super().__init__(PlanOprType.CREATE_INDEX) self._name = name @@ -111,6 +124,7 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -123,6 +137,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) self._project_expr_list = project_expr_list self._index_def = index_def ======= @@ -132,10 +150,13 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= self._project_expr_list = project_expr_list self._index_def = index_def @@ -154,6 +175,7 @@ def __init__( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -166,6 +188,10 @@ def __init__( >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @property def name(self): @@ -197,16 +223,20 @@ def vector_store_type(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -223,6 +253,10 @@ def vector_store_type(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def project_expr_list(self): return self._project_expr_list @@ -237,6 +271,7 @@ def index_def(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -249,6 +284,10 @@ def index_def(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= def function(self): return self._function @@ -257,12 +296,16 @@ def function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -279,6 +322,10 @@ def function(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def __str__(self): function_expr = None @@ -304,6 +351,7 @@ def __str__(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -316,6 +364,10 @@ def __str__(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "" if function_expr is None else "function={}".format(function_expr), ======= "" if not self._function else "function={}".format(self._function), @@ -324,6 +376,9 @@ def __str__(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= "" if function_expr is None else "function={}".format(function_expr), >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -332,6 +387,7 @@ def __str__(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -350,6 +406,10 @@ def __str__(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) def __hash__(self) -> int: @@ -370,6 +430,7 @@ def __hash__(self) -> int: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -382,6 +443,10 @@ def __hash__(self) -> int: >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) tuple(self.project_expr_list), self.index_def, ======= @@ -391,10 +456,13 @@ def __hash__(self) -> int: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= tuple(self.project_expr_list), self.index_def, @@ -413,6 +481,7 @@ def __hash__(self) -> int: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -425,5 +494,9 @@ def __hash__(self) -> int: >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) ) diff --git a/evadb/third_party/databases/clickhouse/__init__.py b/evadb/third_party/databases/clickhouse/__init__.py index 78545c300..0bc16d496 100644 --- a/evadb/third_party/databases/clickhouse/__init__.py +++ b/evadb/third_party/databases/clickhouse/__init__.py @@ -16,12 +16,17 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> a378db4a (Clickhouse integration (#1281)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<<< HEAD:evadb/third_party/databases/clickhouse/__init__.py """Clickhouse integrations""" ======== @@ -30,11 +35,15 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= """Clickhouse integrations""" >>>>>>> df079bda (Clickhouse integration (#1281)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -42,3 +51,5 @@ """Clickhouse integrations""" >>>>>>> df079bda (Clickhouse integration (#1281)) >>>>>>> a378db4a (Clickhouse integration (#1281)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/evadb/utils/generic_utils.py b/evadb/utils/generic_utils.py index 0ccfde5a5..64b60aa2a 100644 --- a/evadb/utils/generic_utils.py +++ b/evadb/utils/generic_utils.py @@ -320,6 +320,7 @@ def try_to_import_ray(): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -332,6 +333,10 @@ def try_to_import_ray(): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def try_to_import_statsforecast(): ======= def try_to_import_forecast(): @@ -340,6 +345,9 @@ def try_to_import_forecast(): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= def try_to_import_statsforecast(): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -348,6 +356,7 @@ def try_to_import_statsforecast(): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -366,6 +375,10 @@ def try_to_import_statsforecast(): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) try: from statsforecast import StatsForecast # noqa: F401 except ImportError: @@ -384,16 +397,20 @@ def try_to_import_statsforecast(): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -410,6 +427,10 @@ def try_to_import_statsforecast(): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def try_to_import_neuralforecast(): try: from neuralforecast import NeuralForecast # noqa: F401 @@ -428,6 +449,7 @@ def try_to_import_neuralforecast(): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -437,6 +459,8 @@ def try_to_import_neuralforecast(): ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -450,6 +474,7 @@ def try_to_import_neuralforecast(): ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -466,6 +491,8 @@ def try_to_import_neuralforecast(): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def is_ray_available() -> bool: try: try_to_import_ray() @@ -514,17 +541,21 @@ def is_forecast_available() -> bool: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) try_to_import_statsforecast() try_to_import_neuralforecast() ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -543,6 +574,10 @@ def is_forecast_available() -> bool: try_to_import_statsforecast() try_to_import_neuralforecast() ======= +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) try_to_import_statsforecast() try_to_import_neuralforecast() return True @@ -700,6 +735,7 @@ def is_xgboost_available() -> bool: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 201f901b (Starting the change for XGBoost integration into EVADb. (#1232)) <<<<<<< HEAD >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) @@ -707,6 +743,8 @@ def is_xgboost_available() -> bool: ======= ======= >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= try_to_import_forecast() >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -735,7 +773,18 @@ def is_xgboost_available() -> bool: ======= >>>>>>> 201f901b (Starting the change for XGBoost integration into EVADb. (#1232)) >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) +<<<<<<< HEAD >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +======= +>>>>>>> 201f901b (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +======= + try_to_import_forecast() +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) return True except ValueError: # noqa: E722 return False diff --git a/script/formatting/formatter.py b/script/formatting/formatter.py index 568b70fee..3c95403d6 100755 --- a/script/formatting/formatter.py +++ b/script/formatting/formatter.py @@ -466,12 +466,17 @@ def check_file(file): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) subprocess.check_output(""" codespell "evadb/*.py" """, shell=True, universal_newlines=True) @@ -493,6 +498,9 @@ def check_file(file): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= subprocess.check_output(""" codespell "evadb/*.py" """, >>>>>>> 5b27053e (ran spellchecker) @@ -517,6 +525,7 @@ def check_file(file): subprocess.check_output(""" codespell "evadb/*.md" """, >>>>>>> 5b27053e (ran spellchecker) ======= +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -551,6 +560,25 @@ def check_file(file): subprocess.check_output(""" codespell "evadb/*.md" """, >>>>>>> 5b27053e (ran spellchecker) >>>>>>> fb00f6de (ran spellchecker) +======= + shell=True, + universal_newlines=True) + subprocess.check_output("codespell 'evadb/*/*.py'", + shell=True, + universal_newlines=True) + subprocess.check_output("codespell 'docs/source/*/*.rst'", + shell=True, + universal_newlines=True) + subprocess.check_output("codespell 'docs/source/*.rst'", + shell=True, + universal_newlines=True) + subprocess.check_output("codespell '*.md'", + shell=True, + universal_newlines=True) + subprocess.check_output("codespell 'evadb/*.md'", +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) shell=True, universal_newlines=True) diff --git a/script/formatting/spelling.txt b/script/formatting/spelling.txt index bdbc1e6f3..4d80d2c62 100644 --- a/script/formatting/spelling.txt +++ b/script/formatting/spelling.txt @@ -2,11 +2,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 061e9d6d (docs: updates) ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) <<<<<<< HEAD personal_ws-1.1 en 1563 ======= @@ -104,12 +107,17 @@ personal_ws-1.1 en 1776 ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) personal_ws-1.1 en 1776 ======= personal_ws-1.1 en 1467 @@ -117,6 +125,7 @@ personal_ws-1.1 en 1467 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) @@ -189,9 +198,22 @@ personal_ws-1.1 en 1776 >>>>>>> 061e9d6d (docs: updates) >>>>>>> 7955cfcb (docs: updates) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +======= +personal_ws-1.1 en 1563 +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ABCD ABCMeta ANYDIM @@ -233,16 +255,22 @@ AggregationExpressionsTest <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 5b27053e (ran spellchecker) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 5b27053e (ran spellchecker) >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) AirData AirDataPanel AirForecast @@ -252,23 +280,32 @@ AirPassengersPanel <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) AliExpress Anirudh AnnotateTests @@ -434,16 +471,22 @@ CreateFromSelectPlan <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 5b27053e (ran spellchecker) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 5b27053e (ran spellchecker) >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) CreateFunctionExecutor CreateFunctionExecutorTest CreateFunctionPlan @@ -453,23 +496,32 @@ CreateIndex <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) CreateIndexExecutor CreateIndexPlan CreateIndexStatement @@ -563,8 +615,11 @@ DemoDB <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) DemoFunc ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -572,11 +627,15 @@ DemoFunc DemoFunc >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= DemoFunc ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= DemoFunc ======= @@ -584,6 +643,8 @@ DemoFunc >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) DemoTable DemoUDF Deserialize @@ -735,16 +796,24 @@ GenericLudwigModel <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 5b27053e (ran spellchecker) >>>>>>> fb00f6de (ran spellchecker) +======= +======= +>>>>>>> 5b27053e (ran spellchecker) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) GenericSklearnModel GenericUtilsTests GenericXGBoostModel GithubDataSourceTest GithubHandler <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= @@ -764,6 +833,7 @@ GithubHandler ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -771,6 +841,8 @@ GithubHandler ======= >>>>>>> 5b27053e (ran spellchecker) >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) GroupBy GroupByExecutor GroupByPlan @@ -1097,8 +1169,11 @@ MySQLNativeStorageEngineTest <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7955cfcb (docs: updates) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) MyTable ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -1106,11 +1181,15 @@ MyTable MyTable >>>>>>> 061e9d6d (docs: updates) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= MyTable ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= MyTable ======= @@ -1118,6 +1197,8 @@ MyTable >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 7955cfcb (docs: updates) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) MyTextCSV MyUDF MyVideo @@ -1135,6 +1216,7 @@ MydbHandler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -1143,6 +1225,8 @@ MydbHandler >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) MysqlHandler NBEATS NCHAR @@ -1155,12 +1239,17 @@ MysqlHandler >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) MysqlHandler <<<<<<< HEAD ======= @@ -1177,16 +1266,22 @@ MysqlHandler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= NBEATS @@ -1208,6 +1303,7 @@ NCHAR ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -1266,6 +1362,9 @@ MysqlHandler >>>>>>> 7dd70375 (release: merge staging into master (#1032)) >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) NEQ NHITS NLP @@ -1527,12 +1626,16 @@ SamplePlan <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -1545,12 +1648,17 @@ SamplePlan >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) SampleTable SampleVideoTable >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -1610,11 +1718,14 @@ SampleVideoTable <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1623,6 +1734,7 @@ SampleVideoTable ======= ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= @@ -1630,17 +1742,23 @@ SampleVideoTable ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -1674,6 +1792,9 @@ SampleVideoTable ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) Scalability ScanPlan SchemaUtils @@ -1785,8 +1906,11 @@ TestUDF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) TextClassifier ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -1794,11 +1918,15 @@ TextClassifier TextClassifier >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= TextClassifier ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= TextClassifier ======= @@ -1806,6 +1934,8 @@ TextClassifier >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) TextFilterKeyword TextFilteringTests TextHFModel @@ -1817,8 +1947,11 @@ TextProcessing <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) TextSummarizer ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -1826,11 +1959,15 @@ TextSummarizer TextSummarizer >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= TextSummarizer ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= TextSummarizer ======= @@ -1838,6 +1975,8 @@ TextSummarizer >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) TextTestRunner TimeoutError TimerTests @@ -2239,12 +2378,17 @@ exprs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) extname extractOne extrator @@ -2254,20 +2398,28 @@ extractOne <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= extname extractOne extrator >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) f'LOAD facebook facedetector @@ -2295,10 +2447,14 @@ feedstock <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= @@ -2312,6 +2468,11 @@ fetchall ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +======= +fetchall +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -2342,6 +2503,7 @@ fetchall <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -2349,6 +2511,8 @@ fetchall ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= fetchall ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) @@ -2359,6 +2523,7 @@ fetchall >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -2367,17 +2532,25 @@ fetchall >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -2414,6 +2587,9 @@ fetchall ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ffill ffmpeg fileFormat @@ -2457,8 +2633,11 @@ gc <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) gcp ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -2466,11 +2645,15 @@ gcp gcp >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= gcp ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= gcp ======= @@ -2478,6 +2661,8 @@ gcp >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) gdp georgia geq @@ -2571,8 +2756,11 @@ invaid <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) inviter ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -2580,11 +2768,15 @@ inviter inviter >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= inviter ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= inviter ======= @@ -2592,6 +2784,8 @@ inviter >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) io ipynb iq @@ -2760,8 +2954,11 @@ poolclass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) popitem ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -2769,11 +2966,15 @@ popitem popitem >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= popitem ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= popitem ======= @@ -2781,6 +2982,8 @@ popitem >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) popleft pos posix @@ -2973,6 +3176,7 @@ sk <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -3016,13 +3220,19 @@ smallint >>>>>>> fb00f6de (ran spellchecker) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) sklearn ======= ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) sklearn >>>>>>> 62080794 (ran spellchecker) smallint @@ -3060,6 +3270,7 @@ smallint <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -3067,6 +3278,8 @@ smallint ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= smallint ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) @@ -3077,6 +3290,7 @@ smallint >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -3085,17 +3299,25 @@ smallint >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -3131,6 +3353,9 @@ smallint ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) smi softmax spacy @@ -3258,8 +3483,11 @@ timm <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) tinyint ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -3267,11 +3495,15 @@ tinyint tinyint >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= tinyint ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= tinyint ======= @@ -3279,6 +3511,8 @@ tinyint >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) tmp toGrayscale toc @@ -3329,8 +3563,11 @@ urls <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) usecase ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -3338,11 +3575,15 @@ usecase usecase >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= usecase ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= usecase ======= @@ -3350,6 +3591,8 @@ usecase >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) usecases usecols utf diff --git a/setup.py b/setup.py index 4107a2ed3..bc295de8a 100644 --- a/setup.py +++ b/setup.py @@ -339,6 +339,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 = [ @@ -387,6 +391,7 @@ def read(path, encoding="utf-8"): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -421,6 +426,18 @@ def read(path, encoding="utf-8"): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "sklearn": sklearn_libs, "xgboost": xgboost_libs, "forecasting": forecasting_libs, @@ -533,6 +550,7 @@ def read(path, encoding="utf-8"): ======= "dev": dev_libs + vision_libs + document_libs + function_libs + notebook_libs + forecasting_libs + sklearn_libs + imagegen_libs + xgboost_libs <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 201f901b (Starting the change for XGBoost integration into EVADb. (#1232)) <<<<<<< HEAD >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) @@ -599,9 +617,24 @@ def read(path, encoding="utf-8"): ======= ======= "dev": dev_libs + vision_libs + document_libs + function_libs + notebook_libs + forecasting_libs + sklearn_libs + imagegen_libs + xgboost_libs +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 201f901b (Starting the change for XGBoost integration into EVADb. (#1232)) +<<<<<<< HEAD >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) +<<<<<<< HEAD >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +======= +======= +======= + "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)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 4db9b841b..33a425e20 100644 --- a/test/integration_tests/long/test_function_executor.py +++ b/test/integration_tests/long/test_function_executor.py @@ -170,6 +170,10 @@ def test_create_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -185,6 +189,9 @@ def test_create_function(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -192,6 +199,7 @@ def test_create_function(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -242,6 +250,12 @@ def test_create_function(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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};") @@ -268,6 +282,11 @@ def test_create_or_replace(self): <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -313,11 +332,14 @@ def test_create_or_replace(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -326,18 +348,22 @@ def test_create_or_replace(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -374,6 +400,9 @@ def test_create_or_replace(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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};") @@ -569,12 +598,17 @@ def test_should_raise_if_function_file_is_modified(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> fb00f6de (ran spellchecker) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # disabling warning for function modification for now ======= # disabling warning for function modificiation for now @@ -582,11 +616,15 @@ def test_should_raise_if_function_file_is_modified(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= # disabling warning for function modification for now >>>>>>> 5b27053e (ran spellchecker) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -594,6 +632,8 @@ def test_should_raise_if_function_file_is_modified(self): # disabling warning for function modification for now >>>>>>> 5b27053e (ran spellchecker) >>>>>>> fb00f6de (ran spellchecker) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # with self.assertRaises(AssertionError): execute_query_fetch_all(self.evadb, select_query) diff --git a/test/integration_tests/long/test_model_forecasting.py b/test/integration_tests/long/test_model_forecasting.py index 4ecadcef4..291b83185 100644 --- a/test/integration_tests/long/test_model_forecasting.py +++ b/test/integration_tests/long/test_model_forecasting.py @@ -40,6 +40,10 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -126,14 +130,22 @@ def setUpClass(cls): >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) create_table_query = """ CREATE TABLE AirDataPanel (\ unique_id TEXT(30),\ @@ -153,6 +165,11 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -198,11 +215,14 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -211,18 +231,22 @@ def setUpClass(cls): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -259,6 +283,9 @@ def setUpClass(cls): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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) @@ -277,6 +304,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -284,6 +312,8 @@ def setUpClass(cls): ======= >>>>>>> 8eeef957 (Add support for Neuralforecast (#1115)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= ======= @@ -294,6 +324,7 @@ def setUpClass(cls): ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -304,6 +335,8 @@ def setUpClass(cls): ======= ======= >>>>>>> 8eeef957 (Add support for Neuralforecast (#1115)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD ======= @@ -312,11 +345,15 @@ def setUpClass(cls): >>>>>>> e8a181c5 (Add support for Neuralforecast (#1115)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> ca239aea (Add support for Neuralforecast (#1115)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -347,6 +384,9 @@ def setUpClass(cls): ======= >>>>>>> ca239aea (Add support for Neuralforecast (#1115)) >>>>>>> 8eeef957 (Add support for Neuralforecast (#1115)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) path = f"{EvaDB_ROOT_DIR}/data/forecasting/AirPassengersPanel.csv" load_query = f"LOAD CSV '{path}' INTO AirDataPanel;" execute_query_fetch_all(cls.evadb, load_query) @@ -413,6 +453,11 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -458,11 +503,14 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -471,18 +519,22 @@ def setUpClass(cls): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -519,6 +571,9 @@ def setUpClass(cls): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @classmethod def tearDownClass(cls): shutdown_ray() @@ -527,6 +582,10 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -542,6 +601,9 @@ def tearDownClass(cls): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -549,6 +611,7 @@ def tearDownClass(cls): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -599,6 +662,12 @@ def tearDownClass(cls): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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;") @@ -606,6 +675,11 @@ def tearDownClass(cls): execute_query_fetch_all(cls.evadb, "DROP FUNCTION IF EXISTS HomeForecast;") <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -652,6 +726,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -670,12 +745,18 @@ def tearDownClass(cls): ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> eva-master +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= execute_query_fetch_all(cls.evadb, "DROP TABLE IF EXISTS HomeRentals;") >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -716,6 +797,14 @@ def tearDownClass(cls): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @forecast_skip_marker def test_forecast(self): @@ -801,12 +890,17 @@ def test_forecast(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= CREATE FUNCTION Forecast FROM (SELECT unique_id, ds, y FROM AirData) @@ -815,6 +909,9 @@ def test_forecast(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -837,6 +934,7 @@ def test_forecast(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -857,6 +955,8 @@ def test_forecast(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) PREDICT 'y'; """ execute_query_fetch_all(self.evadb, create_predict_udf) @@ -875,6 +975,7 @@ def test_forecast(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD SELECT AirForecast() order by y; ======= @@ -1049,8 +1150,12 @@ def test_forecast_with_column_rename(self): >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= >>>>>>> 8eeef957 (Add support for Neuralforecast (#1115)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) SELECT AirForecast() order by y; ======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= >>>>>>> ca239aea (Add support for Neuralforecast (#1115)) ======= ======= @@ -1190,6 +1295,12 @@ def test_forecast_with_column_rename(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) SELECT AirForecast() order by y; """ result = execute_query_fetch_all(self.evadb, predict_query) @@ -1249,6 +1360,7 @@ def test_forecast_with_column_rename(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= ======= @@ -1256,10 +1368,28 @@ def test_forecast_with_column_rename(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +>>>>>>> eva-master +======= +======= + SELECT Forecast(12) FROM AirData; + """ + result = execute_query_fetch_all(self.evadb, predict_query) + self.assertEqual(int(list(result.frames.iloc[:, -1])[-1]), 459) +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 64919aa61..627422630 100644 --- a/test/integration_tests/long/test_model_train.py +++ b/test/integration_tests/long/test_model_train.py @@ -150,17 +150,22 @@ def test_ludwig_automl(self): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) CREATE OR REPLACE FUNCTION PredictHouseRentLudwig FROM >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -173,6 +178,8 @@ def test_ludwig_automl(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) CREATE OR REPLACE FUNCTION PredictHouseRentLudwig FROM ======= CREATE FUNCTION IF NOT EXISTS PredictHouseRent FROM @@ -194,6 +201,9 @@ def test_ludwig_automl(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -202,16 +212,20 @@ def test_ludwig_automl(self): >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= CREATE FUNCTION IF NOT EXISTS PredictHouseRent FROM >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -263,6 +277,9 @@ def test_ludwig_automl(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 3c9738296..5a661f062 100644 --- a/test/integration_tests/long/test_reuse.py +++ b/test/integration_tests/long/test_reuse.py @@ -58,6 +58,10 @@ def setUp(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -73,6 +77,9 @@ def setUp(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -80,6 +87,7 @@ def setUp(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -130,6 +138,12 @@ def setUp(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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", @@ -141,6 +155,11 @@ def setUp(self): ) <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -186,11 +205,14 @@ def setUp(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -199,18 +221,22 @@ def setUp(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -247,6 +273,9 @@ def setUp(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 fad0489bc..8a476fb5b 100644 --- a/test/integration_tests/short/test_drop_executor.py +++ b/test/integration_tests/short/test_drop_executor.py @@ -115,6 +115,10 @@ def test_should_drop_table(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -130,6 +134,9 @@ def test_should_drop_table(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -137,6 +144,7 @@ def test_should_drop_table(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -187,6 +195,12 @@ def test_should_drop_table(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # we should be able to re-create the table execute_query_fetch_all(self.evadb, query) # clean up @@ -194,6 +208,11 @@ def test_should_drop_table(self): <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -239,11 +258,14 @@ def test_should_drop_table(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -252,18 +274,22 @@ def test_should_drop_table(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -300,6 +326,9 @@ def test_should_drop_table(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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)) @@ -327,6 +356,10 @@ def test_should_drop_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -342,6 +375,9 @@ def test_should_drop_function(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -349,6 +385,7 @@ def test_should_drop_function(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -399,6 +436,12 @@ def test_should_drop_function(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # We should be able to re-create the function self.run_create_function_query() # clean up @@ -415,6 +458,9 @@ def test_drop_wrong_function_name(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -422,8 +468,11 @@ def test_drop_wrong_function_name(self): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= def test_drop_wrong_function_name(self): self.run_create_function_query() @@ -437,14 +486,20 @@ def test_drop_wrong_function_name(self): >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # Test that dropping the wrong FUNCTION: # - does not affect FUNCTIONs in the catalog # - raises an appropriate exception diff --git a/test/integration_tests/short/test_select_executor.py b/test/integration_tests/short/test_select_executor.py index dbf3ec583..9ee4c894e 100644 --- a/test/integration_tests/short/test_select_executor.py +++ b/test/integration_tests/short/test_select_executor.py @@ -457,17 +457,22 @@ def test_expression_tree_signature(self): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) signature = next(plan.find_all(LogicalFilter)).predicate.children[0].signature() >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -480,6 +485,8 @@ def test_expression_tree_signature(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) signature = next(plan.find_all(LogicalFilter)).predicate.children[0].signature() ======= signature = plan.target_list[0].signature() @@ -501,6 +508,9 @@ def test_expression_tree_signature(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -509,16 +519,20 @@ def test_expression_tree_signature(self): >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= signature = plan.target_list[0].signature() >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -570,6 +584,9 @@ def test_expression_tree_signature(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 255882bcb..b93642349 100644 --- a/test/markers.py +++ b/test/markers.py @@ -36,7 +36,9 @@ >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) is_chromadb_available, is_flaml_automl_available, @@ -56,10 +58,13 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -68,6 +73,8 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) is_chromadb_available, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -81,6 +88,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -107,6 +115,8 @@ >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= is_chromadb_available, ======= @@ -122,6 +132,7 @@ ======= ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -137,6 +148,14 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> eva-master +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) is_forecast_available, is_gpu_available, is_ludwig_available, @@ -278,16 +297,22 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 2b924b76 (Add stable diffusion integration (#1240)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2b924b76 (Add stable diffusion integration (#1240)) >>>>>>> 8a8a90aa (Add stable diffusion integration (#1240)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) stable_diffusion_skip_marker = pytest.mark.skipif( is_replicate_available() is False, reason="requires replicate" @@ -296,20 +321,29 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a8a90aa (Add stable diffusion integration (#1240)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 2b924b76 (Add stable diffusion integration (#1240)) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 8a8a90aa (Add stable diffusion integration (#1240)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/test/unit_tests/binder/test_statement_binder.py b/test/unit_tests/binder/test_statement_binder.py index 61eb70b60..60a20bae3 100644 --- a/test/unit_tests/binder/test_statement_binder.py +++ b/test/unit_tests/binder/test_statement_binder.py @@ -346,16 +346,20 @@ def test_bind_create_index(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -372,6 +376,10 @@ def test_bind_create_index(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) col_def = MagicMock() col_def.name = "a" create_index_statement.col_list = [col_def] @@ -413,20 +421,27 @@ def test_bind_create_index(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= create_index_statement.col_list = ["foo"] ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= create_index_statement.col_list = ["foo"] >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -435,11 +450,14 @@ def test_bind_create_index(self): >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) function_obj = MagicMock() output = MagicMock() function_obj.outputs = [output] >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD create_index_statement.project_expr_list = [ @@ -459,6 +477,8 @@ def test_bind_create_index(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) create_index_statement.project_expr_list = [ FunctionExpression(MagicMock(), name="a"), @@ -466,6 +486,8 @@ def test_bind_create_index(self): ] ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) with patch.object( catalog(), @@ -489,6 +511,7 @@ def test_bind_create_index(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -501,6 +524,10 @@ def test_bind_create_index(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) create_index_statement.project_expr_list = [TupleValueExpression(name="*")] ======= create_index_statement.function = None @@ -515,6 +542,9 @@ def test_bind_create_index(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= create_index_statement.project_expr_list = [TupleValueExpression(name="*")] >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -523,6 +553,7 @@ def test_bind_create_index(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -541,6 +572,10 @@ def test_bind_create_index(self): >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) with self.assertRaises(AssertionError): binder._bind_create_index_statement(create_index_statement) @@ -561,13 +596,17 @@ def test_bind_create_index(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -575,12 +614,17 @@ def test_bind_create_index(self): >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -610,12 +654,18 @@ def test_bind_create_index(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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() create_function_statement.function_type = "ludwig" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -623,8 +673,11 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= def test_bind_create_function_should_raise(self): with patch.object(StatementBinder, "bind"): @@ -640,11 +693,15 @@ def test_bind_create_function_should_raise(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -667,6 +724,8 @@ def test_bind_create_function_should_raise(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (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() @@ -680,18 +739,25 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -729,6 +795,8 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) create_function_statement.query.target_list = [] create_function_statement.metadata = [] binder = StatementBinder(StatementBinderContext(MagicMock())) @@ -746,13 +814,17 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -760,12 +832,17 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -795,12 +872,18 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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() create_function_statement.function_type = "ludwig" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -808,8 +891,11 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= def test_bind_create_function_should_drop_row_id(self): with patch.object(StatementBinder, "bind"): @@ -825,11 +911,15 @@ def test_bind_create_function_should_drop_row_id(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -852,6 +942,8 @@ def test_bind_create_function_should_drop_row_id(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (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() @@ -865,18 +957,25 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -914,6 +1013,8 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) row_id_col_obj = ColumnCatalogEntry( name=IDENTIFIER_COLUMN, type=MagicMock(), @@ -982,6 +1083,10 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -997,6 +1102,9 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -1004,6 +1112,7 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -1054,6 +1163,12 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def test_bind_create_function_should_bind_forecast_with_default_columns(self): with patch.object(StatementBinder, "bind"): @@ -1347,6 +1462,11 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel self.assertEqual(str(cm.exception), err_msg) <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -1392,11 +1512,14 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1405,18 +1528,22 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -1453,3 +1580,6 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/test/unit_tests/catalog/test_catalog_manager.py b/test/unit_tests/catalog/test_catalog_manager.py index 30a364af8..bba3f55e9 100644 --- a/test/unit_tests/catalog/test_catalog_manager.py +++ b/test/unit_tests/catalog/test_catalog_manager.py @@ -151,12 +151,17 @@ def test_insert_function( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) function_mock.return_value.insert_entry.assert_called_with( "function", "sample.py", @@ -175,8 +180,11 @@ def test_insert_function( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= function_mock.return_value.insert_entry.assert_called_with( "function", @@ -187,12 +195,17 @@ def test_insert_function( function_metadata_list, >>>>>>> d4c650b6 (fix: make the table/function catalog insert operation atomic (#1293)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> bc98b4af (fix: make the table/function catalog insert operation atomic (#1293)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ) checksum_mock.assert_called_with("sample.py") self.assertEqual(actual, function_mock.return_value.insert_entry.return_value) diff --git a/test/unit_tests/executor/test_create_udf_executor.py b/test/unit_tests/executor/test_create_udf_executor.py index 4d3ae214c..372edf83a 100644 --- a/test/unit_tests/executor/test_create_udf_executor.py +++ b/test/unit_tests/executor/test_create_udf_executor.py @@ -60,6 +60,10 @@ def test_should_create_function(self, load_function_class_from_file_mock): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -75,6 +79,9 @@ def test_should_create_function(self, load_function_class_from_file_mock): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -82,6 +89,7 @@ def test_should_create_function(self, load_function_class_from_file_mock): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -132,6 +140,12 @@ def test_should_create_function(self, load_function_class_from_file_mock): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def test_should_raise_or_replace_if_not_exists(self): plan = type( "CreateFunctionPlan", @@ -166,6 +180,7 @@ def test_should_skip_if_not_exists(self, load_function_class_from_file_mock): <<<<<<< HEAD <<<<<<< HEAD ======= +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -177,11 +192,14 @@ def test_should_skip_if_not_exists(self, load_function_class_from_file_mock): ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -189,6 +207,8 @@ def test_should_skip_if_not_exists(self, load_function_class_from_file_mock): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD catalog_instance = MagicMock() catalog_instance().get_function_catalog_entry_by_name.return_value = True @@ -197,6 +217,7 @@ def test_should_skip_if_not_exists(self, load_function_class_from_file_mock): ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= @@ -208,6 +229,8 @@ def test_should_skip_if_not_exists(self, load_function_class_from_file_mock): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @patch("evadb.executor.create_function_executor.load_function_class_from_file") def test_should_raise_error_on_incorrect_io_definition( self, load_function_class_from_file_mock @@ -225,11 +248,14 @@ def test_should_raise_error_on_incorrect_io_definition( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -242,6 +268,7 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -250,11 +277,16 @@ def test_should_raise_error_on_incorrect_io_definition( ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -293,6 +325,9 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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() @@ -301,6 +336,10 @@ def test_should_raise_error_on_incorrect_io_definition( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -316,6 +355,9 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -323,6 +365,7 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -373,6 +416,12 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) plan = type( "CreateFunctionPlan", (), @@ -519,6 +568,9 @@ def test_should_raise_error_on_incorrect_io_definition( load_function_class_from_file_mock.return_value.return_value = "mock_class" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= @@ -533,10 +585,13 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) incorrect_input_definition = PandasDataframe( columns=["Frame_Array", "Frame_Array_2"], column_types=[NdArrayType.UINT8], @@ -589,17 +644,22 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) "Error creating function, input/output definition incorrect:", >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -612,6 +672,8 @@ def test_should_raise_error_on_incorrect_io_definition( ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "Error creating function, input/output definition incorrect:", ======= "Error creating Function, input/output definition incorrect:", @@ -633,6 +695,9 @@ def test_should_raise_error_on_incorrect_io_definition( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -641,16 +706,20 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= "Error creating Function, input/output definition incorrect:", >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -702,6 +771,9 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 e036c42c2..b640d21c7 100644 --- a/test/unit_tests/executor/test_plan_executor.py +++ b/test/unit_tests/executor/test_plan_executor.py @@ -204,17 +204,22 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) tree = MagicMock(node=CreateFunctionPlan(None, False, False, [], [], None)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -227,6 +232,8 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) tree = MagicMock(node=CreateFunctionPlan(None, False, False, [], [], None)) ======= tree = MagicMock(node=CreateFunctionPlan(None, False, [], [], None)) @@ -248,6 +255,9 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -256,16 +266,20 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= tree = MagicMock(node=CreateFunctionPlan(None, False, [], [], None)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -317,6 +331,9 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 4a674b930..264f70bb9 100644 --- a/test/unit_tests/optimizer/test_statement_to_opr_converter.py +++ b/test/unit_tests/optimizer/test_statement_to_opr_converter.py @@ -140,6 +140,10 @@ def test_visit_select_should_not_call_visits_for_null_values(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -155,6 +159,9 @@ def test_visit_select_should_not_call_visits_for_null_values(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -162,6 +169,7 @@ def test_visit_select_should_not_call_visits_for_null_values(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -212,6 +220,12 @@ def test_visit_select_should_not_call_visits_for_null_values(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def test_visit_select_without_table_ref(self): converter = StatementToPlanConverter() converter.visit_table_ref = MagicMock() @@ -235,6 +249,11 @@ def test_visit_select_without_table_ref(self): <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -280,11 +299,14 @@ def test_visit_select_without_table_ref(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -293,18 +315,22 @@ def test_visit_select_without_table_ref(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -341,6 +367,9 @@ def test_visit_select_without_table_ref(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) @patch("evadb.optimizer.statement_to_opr_converter.LogicalCreateFunction") @patch( "evadb.optimizer.\ @@ -609,15 +638,20 @@ def test_check_plan_equality(self): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -626,6 +660,8 @@ def test_check_plan_equality(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -640,11 +676,14 @@ def test_check_plan_equality(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -654,17 +693,21 @@ def test_check_plan_equality(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -703,6 +746,9 @@ def test_check_plan_equality(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 7c918fdb9..efd8ee194 100644 --- a/test/unit_tests/parser/test_parser.py +++ b/test/unit_tests/parser/test_parser.py @@ -160,6 +160,7 @@ def test_create_index_statement(self): ======= ======= +<<<<<<< HEAD # create if_not_exists expected_stmt = CreateIndexStatement( "testindex", @@ -183,6 +184,12 @@ def test_create_index_statement(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) # create if_not_exists <<<<<<< HEAD expected_stmt = CreateIndexStatement( @@ -355,10 +362,13 @@ def test_create_index_statement(self): >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) # create index on Function expression create_index_query = ( "CREATE INDEX testindex ON MyVideo (FeatureExtractor(featCol)) USING FAISS;" @@ -988,17 +998,22 @@ def test_select_function_star(self): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) query = "SELECT DemoFunc(*) FROM DemoDB.DemoTable;" >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -1011,6 +1026,8 @@ def test_select_function_star(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) query = "SELECT DemoFunc(*) FROM DemoDB.DemoTable;" ======= query = "SELECT DemoFunc(*) FROM DemoDB.DemoTable" @@ -1032,6 +1049,9 @@ def test_select_function_star(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -1040,16 +1060,20 @@ def test_select_function_star(self): >>>>>>> 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)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= query = "SELECT DemoFunc(*) FROM DemoDB.DemoTable" >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -1101,6 +1125,9 @@ def test_select_function_star(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) evadb_stmt_list = parser.parse(query) # check stmt itself @@ -1215,6 +1242,10 @@ def test_delete_statement(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -1230,6 +1261,9 @@ def test_delete_statement(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -1237,6 +1271,7 @@ def test_delete_statement(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -1287,6 +1322,12 @@ def test_delete_statement(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) def test_set_statement(self): parser = Parser() set_statement = """SET OPENAIKEY = 'ABCD'""" @@ -1402,6 +1443,9 @@ def test_create_function_statement(self): parser = Parser() <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1409,22 +1453,31 @@ def test_create_function_statement(self): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= def test_create_function_statement(self): parser = Parser() >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) create_func_query = """CREATE FUNCTION IF NOT EXISTS FastRCNN INPUT (Frame_Array NDARRAY UINT8(3, 256, 256)) OUTPUT (Labels NDARRAY STR(10), Bbox NDARRAY UINT8(10, 4)) @@ -1567,10 +1620,14 @@ def test_should_return_false_for_unequal_expression(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD False, ======= @@ -1603,15 +1660,25 @@ def test_should_return_false_for_unequal_expression(self): >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) False, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) False, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) False, +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) False, Path("data/fastrcnn.py"), [ @@ -1809,6 +1876,7 @@ def test_create_job(self): ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -1839,6 +1907,13 @@ def test_create_job(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> b87af508 (feat: sync master staging (#1050)) def test_lark(self): @@ -1876,6 +1951,12 @@ def test_lark(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -1883,17 +1964,21 @@ def test_lark(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= ======= +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -1945,3 +2030,6 @@ def test_lark(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 f6eff89ec..0f2b9a5ad 100644 --- a/test/unit_tests/plan_nodes/test_plan.py +++ b/test/unit_tests/plan_nodes/test_plan.py @@ -91,15 +91,20 @@ def test_create_function_plan(self): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) or_replace = False >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= @@ -108,6 +113,8 @@ def test_create_function_plan(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) or_replace = False ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -122,10 +129,13 @@ def test_create_function_plan(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= or_replace = False ======= @@ -136,17 +146,21 @@ def test_create_function_plan(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -185,6 +199,9 @@ def test_create_function_plan(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) if_not_exists = True functionIO = "functionIO" inputs = [functionIO, functionIO] @@ -203,13 +220,17 @@ def test_create_function_plan(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -217,12 +238,17 @@ def test_create_function_plan(self): >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +======= +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -252,6 +278,9 @@ def test_create_function_plan(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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) @@ -259,6 +288,9 @@ def test_create_function_plan(self): self.assertEqual(node.if_not_exists, if_not_exists) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD <<<<<<< HEAD @@ -266,8 +298,11 @@ def test_create_function_plan(self): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= function_name, if_not_exists, inputs, outputs, impl_path, ty ) @@ -284,11 +319,15 @@ def test_create_function_plan(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -311,6 +350,8 @@ def test_create_function_plan(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f431fb09 (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) @@ -325,18 +366,25 @@ def test_create_function_plan(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -374,6 +422,8 @@ def test_create_function_plan(self): >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (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 710d81c80..b151b6582 100644 --- a/test/unit_tests/storage/test_sqlite_native_storage_engine.py +++ b/test/unit_tests/storage/test_sqlite_native_storage_engine.py @@ -41,12 +41,16 @@ def __init__(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -64,6 +68,11 @@ class SQLiteNativeStorageEngineTest(unittest.TestCase): ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +======= +class SQLiteNativeStorageEngineTest(unittest.TestCase): +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -105,9 +114,12 @@ class SQLiteNativeStorageEngineTest(unittest.TestCase): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= ======= @@ -116,12 +128,17 @@ class SQLiteNativeStorageEngineTest(unittest.TestCase): >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= class SQLiiteNativeStorageEngineTest(unittest.TestCase): @@ -129,11 +146,15 @@ class SQLiiteNativeStorageEngineTest(unittest.TestCase): >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -183,6 +204,9 @@ class SQLiteNativeStorageEngineTest(unittest.TestCase): ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 2ed196beb..2909970d9 100644 --- a/test/util.py +++ b/test/util.py @@ -41,6 +41,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -56,6 +60,9 @@ >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -63,6 +70,7 @@ >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -113,12 +121,23 @@ >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> eva-master +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) from evadb.functions.abstract.abstract_function import ( AbstractClassifierFunction, AbstractFunction, ) <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -165,6 +184,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -184,11 +204,17 @@ >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= ======= +>>>>>>> eva-master +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= +======= from evadb.functions.abstract.abstract_function import AbstractClassifierFunction >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -229,6 +255,14 @@ >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (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 ec51495db..e0d2bc297 100644 --- a/tutorials/11-similarity-search-for-motif-mining.ipynb +++ b/tutorials/11-similarity-search-for-motif-mining.ipynb @@ -242,8 +242,18 @@ ======= ] <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 16873683 (Fix Notebook and Ray testcases at staging (#1274)) +<<<<<<< HEAD >>>>>>> 97f14f19 (Fix Notebook and Ray testcases at staging (#1274)) +======= +======= +<<<<<<< HEAD +======= +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) }, "execution_count": 3, "metadata": {}, @@ -252,17 +262,24 @@ ], "source": [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "cursor.query(\"DROP TABLE IF EXISTS reddit_dataset;\").df()\n", "cursor.query(\"LOAD IMAGE 'reddit-images/*.jpg' INTO reddit_dataset;\").df()" ======= ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= + "cursor.query(\"DROP TABLE IF EXISTS reddit_dataset;\").df()\n", + "cursor.query(\"LOAD IMAGE 'reddit-images/*.jpg' INTO reddit_dataset;\").df()" +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "response = cursor.query(\"DROP TABLE IF EXISTS reddit_dataset;\").df()\n", "cursor.query(\n", " \"LOAD IMAGE 'reddit-images/*.jpg' INTO reddit_dataset;\"\n", ").df()\n" <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= ======= @@ -274,6 +291,9 @@ "source": [ "# Similarity search for motif mining" >>>>>>> 7cac771f (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ] }, { @@ -331,6 +351,7 @@ } }, >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= "execution_count": 1, "id": "aa5181dc", @@ -432,6 +453,8 @@ "id": "3b9bca7b", "metadata": {}, >>>>>>> 7cac771f (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "outputs": [ { "data": { @@ -462,10 +485,14 @@ " 0\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) " Function SiftFeatureExtractor successfully add...\n", ======= " UDF SiftFeatureExtractor successfully added to...\n", >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= " Number of loaded IMAGE: 34\n", " \n", @@ -565,6 +592,8 @@ ======= " Function SiftFeatureExtractor successfully add...\n", >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) " \n", " \n", "\n", @@ -576,10 +605,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "0 Function SiftFeatureExtractor successfully add..." ======= "0 UDF SiftFeatureExtractor successfully added to..." >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= "0 Function SiftFeatureExtractor successfully add..." >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -589,6 +622,8 @@ ======= "0 Function SiftFeatureExtractor successfully add..." >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ] }, "execution_count": 4, @@ -613,6 +648,12 @@ >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) <<<<<<< HEAD ======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD ======= @@ -689,6 +730,7 @@ " IMPL '../evadb/functions/sift_feature_extractor.py'\"\"\").df()" >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= @@ -719,6 +761,9 @@ ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ] }, { @@ -728,11 +773,16 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "metadata": {}, ======= ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= + "metadata": {}, +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "metadata": { "execution": { "iopub.execute_input": "2023-07-11T07:28:21.277349Z", @@ -742,6 +792,7 @@ } }, <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= "metadata": {}, @@ -751,6 +802,9 @@ ======= "metadata": {}, >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "outputs": [], "source": [ "# Keep track of which image gets the most votes\n", @@ -781,11 +835,16 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "metadata": {}, ======= ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) +======= + "metadata": {}, +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "metadata": { "execution": { "iopub.execute_input": "2023-07-11T07:28:21.284447Z", @@ -795,6 +854,7 @@ } }, <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= "metadata": {}, @@ -804,6 +864,9 @@ ======= "metadata": {}, >>>>>>> c5f43c65 (Bump v0.3.4+ dev) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "outputs": [ { "name": "stderr", @@ -813,6 +876,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) "09-06-2023 16:13:31 WARNING[drop_object_executor:drop_object_executor.py:_handle_drop_index:0110] Index reddit_sift_image_index does not exist, therefore cannot be dropped.\n" ] <<<<<<< HEAD @@ -822,17 +888,24 @@ >>>>>>> a3b6c0c2 (Fix Notebook and Ray testcases at staging (#1274)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) >>>>>>> 16873683 (Fix Notebook and Ray testcases at staging (#1274)) ======= ======= "07-21-2023 09:48:26 WARNING[drop_object_executor:drop_object_executor.py:_handle_drop_index:0106] Index reddit_sift_image_index does not exist, therefore cannot be dropped.\n" +<<<<<<< HEAD ======= "09-06-2023 16:13:31 WARNING[drop_object_executor:drop_object_executor.py:_handle_drop_index:0110] Index reddit_sift_image_index does not exist, therefore cannot be dropped.\n" >>>>>>> 7cac771f (Bump v0.3.4+ dev) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) ] >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= "07-21-2023 09:48:26 WARNING[drop_object_executor:drop_object_executor.py:_handle_drop_index:0106] Index reddit_sift_image_index does not exist, therefore cannot be dropped.\n" ======= @@ -844,6 +917,8 @@ ======= >>>>>>> 16873683 (Fix Notebook and Ray testcases at staging (#1274)) >>>>>>> 97f14f19 (Fix Notebook and Ray testcases at staging (#1274)) +======= +>>>>>>> f431fb09 (feat: sync master staging (#1050)) }, { "cell_type": "markdown",