Skip to content

Commit

Permalink
feat: sync master staging (georgia-tech-db#1050)
Browse files Browse the repository at this point in the history
Co-authored-by: Joy Arulraj <[email protected]>
Co-authored-by: Jiashen Cao <[email protected]>
Co-authored-by: Andy Xu <[email protected]>
Co-authored-by: Sayan Sinha <[email protected]>
Co-authored-by: Hersh Dhillon <[email protected]>
  • Loading branch information
6 people authored and a0x8o committed Nov 22, 2023
1 parent fd62539 commit 453384e
Show file tree
Hide file tree
Showing 90 changed files with 3,469 additions and 444 deletions.
16 changes: 16 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -487,10 +487,26 @@ jobs:
pip install --upgrade pip
pip debug --verbose
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
pip install ".[dev,ludwig,qdrant,forecasting]"
=======
<<<<<<< HEAD
=======
>>>>>>> 5d9d82f0 (feat: sync master staging (#1050))
>>>>>>> 9fe75f29 (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
>>>>>>> eva-master
=======
>>>>>>> 5d9d82f0 (feat: sync master staging (#1050))
>>>>>>> 9fe75f29 (feat: sync master staging (#1050))
source test_evadb/bin/activate
bash script/test/test.sh -m "<< parameters.mode >>"

Expand Down
37 changes: 35 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -500,19 +500,33 @@ 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:
<ul>
<li> 🐙 giving a ⭐ on our <a href="https://github.com/georgia-tech-db/evadb">EvaDB repo on Github</a>
<li> 📟 joining our <a href="https://evadb.ai/community">Slack Community</a>
<li> 🐦 following us on <a href="https://twitter.com/evadb_ai">Twitter</a>
<li> 🐦 following us on <a href="https://medium.com/evadb-blog">Medium</a>
</ul>

## Quick Links

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> eva-master
=======
>>>>>>> 7dd70375 (release: merge staging into master (#1032))
<<<<<<< HEAD
>>>>>>> f028c383 (release: merge staging into master (#1032))
=======
=======
>>>>>>> 5d9d82f0 (feat: sync master staging (#1050))
>>>>>>> 9fe75f29 (feat: sync master staging (#1050))
- [Quick Links](#quick-links)
- [Documentation](#documentation)
- [Why EvaDB](#why-evadb)
Expand Down Expand Up @@ -565,13 +579,24 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht
- [License](#license)
=======
=======
=======
- [Quick Links](#quick-links)
>>>>>>> 2dacff69 (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))
=======
- [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))
## Documentation

Expand Down Expand Up @@ -1059,13 +1084,21 @@ 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))
=======
=======
PREDICT 'rental_price'
TIME_LIMIT 120;
>>>>>>> 5d9d82f0 (feat: sync master staging (#1050))
>>>>>>> 9fe75f29 (feat: sync master staging (#1050))
```

</details>
Expand Down
80 changes: 65 additions & 15 deletions docs/_toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,36 +219,36 @@ parts:
title: Connect to Database
- file: source/overview/concepts
title: Concepts
sections:
- file: source/overview/concepts/data-sources
title: Data Sources
#- file: source/overview/faq

- caption: Use Cases
chapters:
- file: source/usecases/food-review.rst
- file: source/usecases/sentiment-analysis.rst
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))
>>>>>>> f028c383 (release: merge staging into master (#1032))

- caption: User Reference
chapters:
<<<<<<< HEAD
- file: source/reference/evaql
<<<<<<< HEAD
<<<<<<< HEAD
Expand Down Expand Up @@ -296,8 +296,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
Expand All @@ -310,7 +312,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:
Expand Down Expand Up @@ -415,6 +423,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:
Expand Down Expand Up @@ -472,8 +481,21 @@ parts:
=======
- file: source/reference/ai/model-train-xgboost
title: Model Training with XGBoost
<<<<<<< HEAD
>>>>>>> 201f901b (Starting the change for XGBoost integration into EVADb. (#1232))
<<<<<<< HEAD
>>>>>>> 4771bdec (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))
- file: source/reference/ai/model-forecasting
title: Time Series Forecasting
- file: source/reference/ai/hf
Expand All @@ -485,6 +507,7 @@ parts:
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
- file: source/reference/ai/stablediffusion
title: Stable Diffusion
Expand All @@ -503,11 +526,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))
Expand All @@ -524,18 +551,35 @@ parts:
- file: source/reference/ai/custom
title: Custom Model
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD

- file: source/reference/optimizations
title: Optimizations
=======
>>>>>>> 9fe75f29 (feat: sync master staging (#1050))
>>>>>>> 2dacff69 (feat: sync master staging (#1050))
=======

- file: source/reference/optimizations
title: Optimizations
>>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2dacff69 (feat: sync master staging (#1050))
>>>>>>> 53dafecf (feat: sync master staging (#1050))
=======
>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
=======
>>>>>>> eva-master
=======
- file: source/reference/ai/custom
title: Custom Model
>>>>>>> 2dacff69 (feat: sync master staging (#1050))
>>>>>>> 5d9d82f0 (feat: sync master staging (#1050))
>>>>>>> 9fe75f29 (feat: sync master staging (#1050))

# - file: source/reference/io
# title: IO Descriptors
Expand All @@ -553,13 +597,19 @@ parts:

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9fe75f29 (feat: sync master staging (#1050))
- caption: Contribution Guide
=======
- caption: Developer Reference
>>>>>>> 2dacff69 (feat: sync master staging (#1050))
<<<<<<< HEAD
=======
- caption: Contribution Guide
>>>>>>> f398c41b (docs: updates)
=======
>>>>>>> 9fe75f29 (feat: sync master staging (#1050))
chapters:
- file: source/dev-guide/contribute
title: Contributing to EvaDB
Expand Down
5 changes: 5 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
=======
>>>>>>> 8c5b63dc (release: merge staging into master (#1032))


# The name of the Pygments (syntax highlighting) style to use.
pygments_style = "github-dark"

Expand Down Expand Up @@ -219,6 +220,7 @@
=======
=======

<<<<<<< HEAD

for i in os.listdir("../tutorials"):
if i in [
Expand All @@ -236,6 +238,7 @@
>>>>>>> 8c5b63dc (release: merge staging into master (#1032))
>>>>>>> 7dd70375 (release: merge staging into master (#1032))

<<<<<<< HEAD
<<<<<<< HEAD

for i in os.listdir("../tutorials"):
Expand Down Expand Up @@ -275,6 +278,8 @@
=======
>>>>>>> 53dafecf (feat: sync master staging (#1050))
=======
>>>>>>> 5d9d82f0 (feat: sync master staging (#1050))
=======
>>>>>>> 2dacff69 (feat: sync master staging (#1050))
# -- Initialize Sphinx ----------------------------------------------
def setup(app):
Expand Down
Loading

0 comments on commit 453384e

Please sign in to comment.