Skip to content

Commit

Permalink
Merge branch 'master' of github.com:georgia-tech-db/eva
Browse files Browse the repository at this point in the history
  • Loading branch information
gaurav274 committed Aug 15, 2023
2 parents 8b830b3 + 6d0998b commit 895771c
Show file tree
Hide file tree
Showing 109 changed files with 2,399 additions and 3,113 deletions.
134 changes: 124 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ workflows:
v: "3.10"
mode: "TEST"
ray: "DISABLED"
- Linux:
name: "Test | v3.11 | Linux"
v: "3.11"
mode: "TEST"
ray: "DISABLED"
- Linux:
name: "Test | Ray | v3.8 | Linux"
v: "3.8"
Expand All @@ -46,14 +51,18 @@ workflows:
name: "Test | Ray | v3.10 | Linux"
v: "3.10"
mode: "TEST"
ray: "ENABLED"
ray: "ENABLED"
- Postgres:
name: "Test | v3.10 | Linux | Postgres"
v: "3.10"
mode: "TEST"
# Ray does not work on 3.11
# https://github.com/ray-project/ray/issues/33232
# - Linux:
# name: "Test | v3.11 | Linux"
# v: "3.11"
# mode: "TEST"
# ray: "DISABLED"
# ray: "ENABLED"
################################
### NOTEBOOKS
################################
Expand All @@ -73,6 +82,11 @@ workflows:
v: "3.10"
mode: "NOTEBOOK"
ray: "DISABLED"
- Linux:
name: "Notebook | v3.11 | Linux"
v: "3.11"
mode: "NOTEBOOK"
ray: "DISABLED"
- Linux:
name: "Notebook | Ray | v3.8 | Linux"
v: "3.8"
Expand Down Expand Up @@ -147,7 +161,6 @@ jobs:
pip install --upgrade pip
source test_evadb/bin/activate
pip install ".[dev]"
pip uninstall -y ray
# Enable Ray (update evadb.yml file and install Ray package)
- when:
Expand All @@ -159,7 +172,108 @@ jobs:
command: |
source test_evadb/bin/activate
python -c "import yaml;f = open('evadb/evadb.yml', 'r+');config_obj = yaml.load(f, Loader=yaml.FullLoader);config_obj['experimental']['ray'] = True;f.seek(0);f.write(yaml.dump(config_obj));f.truncate();"
pip install ".[dev]"
pip install ".[ray]"
# Install qdrant only on versions < 3.11
- when:
condition:
not:
equal: [ "3.11", << parameters.v >> ]
steps:
- run:
name: Install Qdrant
command: |
source test_evadb/bin/activate
pip install ".[qdrant]"
- run:
name: Test and upload coverage report to coveralls
no_output_timeout: 30m # 30 minute timeout
command: |
source test_evadb/bin/activate
bash script/test/test.sh -m "<< parameters.mode >>"
# Enable cache save conditionally (to avoid empty cache in Notebooks)
- when:
condition:
equal: [ TEST, << parameters.mode >> ]
steps:
- save_cache:
key: v1-model_cache-{{ checksum "setup.py" }}
paths:
- /home/circleci/.cache/huggingface/
- /home/circleci/.cache/torch/
- /home/circleci/.cache/gpt4all/

Postgres:
parameters:
v:
type: string
default: "3.10"
mode:
type: string
default: "ALL"

resource_class: large
docker:
# https://circleci.com/docs/circleci-images#language-image-variants DATABASE_URL: postgresql://postgres:password@localhost:5432/evadb
- image: "cimg/python:<< parameters.v >>"
environment:
PGHOST: localhost
PGUSER: postgres
PGPASSWORD: password
PGDATABASE: evadb
DATABASE_URL: postgresql://postgres:password@localhost:5432/evadb
POSTGRES_DB: evadb
- image: "cimg/postgres:14.8"
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: password
POSTGRES_DB: evadb
steps:

- checkout

- restore_cache:
keys:
- v1-model_cache-{{ checksum "setup.py" }}

- run:
name: install dockerize
command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
environment:
DOCKERIZE_VERSION: v0.6.1

- run:
name: Wait for db to run
command : dockerize -wait tcp://localhost:5432 -timeout 1m

- run:
name: Install EvaDB package from GitHub repo with all dependencies
command: |
"python<< parameters.v >>" -m venv test_evadb
pip install --upgrade pip
source test_evadb/bin/activate
pip install ".[dev]"
- run:
name: Update the evadb yml file to postgres backend.
command: |
source test_evadb/bin/activate
python -c "import yaml;f = open('evadb/evadb.yml', 'r+');config_obj = yaml.load(f, Loader=yaml.FullLoader);config_obj['core']['catalog_database_uri'] = 'postgresql://postgres:password@localhost:5432/evadb';f.seek(0);f.write(yaml.dump(config_obj));f.truncate();"
pip install ".[postgres]"
# Install qdrant only on versions < 3.11
- when:
condition:
not:
equal: [ "3.11", << parameters.v >> ]
steps:
- run:
name: Install Qdrant
command: |
source test_evadb/bin/activate
pip install ".[qdrant]"
- run:
name: Test and upload coverage report to coveralls
Expand All @@ -185,7 +299,7 @@ jobs:
steps:
- checkout
- run:
name: Install EVA package from GitHub repo and run tests
name: Install EvaDB package from GitHub repo and run tests
command: |
choco install python --version=3.10.8 -y
python --version
Expand All @@ -212,7 +326,7 @@ jobs:
pip --version
- checkout
- run:
name: Install EVA package from GitHub repo and run tests
name: Install EvaDB package from GitHub repo and run tests
no_output_timeout: 30m # 30 minute timeout
command: |
python -m venv test_evadb
Expand All @@ -230,7 +344,7 @@ jobs:
steps:
- checkout
- run:
name: Install EVA package from PIP and start server
name: Install EvaDB package from PIP and start server
command: |
pip install --upgrade pip
pip install evadb
Expand All @@ -243,7 +357,7 @@ jobs:
steps:
- checkout
- run:
name: Install EVA package locally and start server
name: Install EvaDB package locally and start server
command: |
pip install --upgrade pip
pip cache purge
Expand All @@ -259,7 +373,7 @@ jobs:
- setup_remote_docker
- checkout
- run:
name: Build EVA Docker image and start server
name: Build EvaDB Docker image and start server
command: |
docker build -t evadb docker
timeout 30 docker run evadb || true
Expand All @@ -272,7 +386,7 @@ jobs:
steps:
- setup_remote_docker
- run:
name: Pull EVA Docker image and start server
name: Pull EvaDB Docker image and start server
command: |
aws --version
docker pull evadbai/evaserver
Expand Down
47 changes: 6 additions & 41 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
name: 🐞 Bug Report
description: Problems with EVA DB
description: Problems with EvaDB
labels: [bug, triage]
body:
- type: markdown
attributes:
value: |
πŸ™ Thanks for submitting a EVA DB Bug Report!

- type: checkboxes
attributes:
Expand All @@ -14,25 +10,9 @@ body:
πŸ” Please search the [issues](https://github.com/georgia-tech-db/eva/issues) to see if a similar bug report already exists.
options:
- label: >
I have searched the EVA DB [issues](https://github.com/georgia-tech-db/eva/issues) and found no similar bug report.
I have searched the EvaDB [issues](https://github.com/georgia-tech-db/eva/issues) and found no similar bug report.
required: true
- type: dropdown
attributes:
label: EVA DB Component
description: |
πŸ€” Please select the part of EVA DB where you found the bug.
multiple: true
options:
- "Query Parser"
- "Query Optimizer"
- "Query Executor"
- "Data Loader"
- "Integrations"
- "Other"
validations:
required: false

- type: textarea
attributes:
label: Bug
Expand All @@ -47,34 +27,19 @@ body:
label: Environment
description: πŸ–₯️ Please specify the software and hardware you used to produce the bug.
placeholder: |
- EVA DB: v2.0.1
- EvaDB: v2.0.1
- OS: Ubuntu 20.04
- Python: 3.9.0
- GPU: Yes
- Ray: Not installed
validations:
required: false

- type: textarea
attributes:
label: Minimal Reproducible Example
description: >
🧐 When asking a question, people will be better able to provide help if you provide code that they can easily understand and use to **reproduce** the problem.
placeholder: |
```
# Code to reproduce your issue here
```
validations:
required: false

- type: textarea
attributes:
label: Additional
description: πŸ“ Anything else you would like to share?

- type: checkboxes
attributes:
label: Are you willing to submit a PR?
description: >
πŸ‘ (Optional) Please consider submitting a [Pull Request](https://github.com/georgia-tech-db/eva/pulls) (PR) to help improve EVA DB for everyone, especially if you have a good understanding of how to implement a fix or feature.
πŸ‘ (Optional) Please consider submitting a [Pull Request](https://github.com/georgia-tech-db/eva/pulls) (PR) to help improve EvaDB for everyone, especially if you have a good understanding of how to implement a fix or feature.
Please see our βœ… [Contributing Guide](https://evadb.readthedocs.io/en/stable/source/contribute/index.html) to get started.
options:
- label: Yes I'd like to help by submitting a PR!
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ blank_issues_enabled: true
contact_links:
- name: πŸ“š Documentation
url: https://evadb.readthedocs.io/en/stable/
about: View EVA DB Docs
about: View EvaDB Documentation
- name: πŸ’¬ Slack
url: https://join.slack.com/t/eva-db/shared_invite/zt-1i10zyddy-PlJ4iawLdurDv~aIAq90Dg
about: Ask on EVA DB Slack Forum
about: Join our Slack!
17 changes: 4 additions & 13 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
name: πŸš€ Feature Request
description: Suggest a feature for EVA DB
description: Suggest a feature for EvaDB
labels: [enhancement]
body:
- type: markdown
attributes:
value: |
πŸ™ Thanks for submitting a EVA DB Feature Request!

- type: checkboxes
attributes:
Expand All @@ -14,15 +10,15 @@ body:
πŸ” Please search the [issues](https://github.com/georgia-tech-db/eva/issues) to see if a similar feature request already exists.
options:
- label: >
I have searched the EVA DB [issues](https://github.com/georgia-tech-db/eva/issues) and found no similar feature requests.
I have searched the EvaDB [issues](https://github.com/georgia-tech-db/eva/issues) and found no similar feature requests.
required: true
- type: textarea
attributes:
label: Description
description: πŸ’‘ A short description of your feature.
placeholder: |
What new feature would you like to see in EVA DB?
What new feature would you like to see in EvaDB?
validations:
required: true

Expand All @@ -34,16 +30,11 @@ body:
placeholder: |
How would this feature be used, and who would use it?
- type: textarea
attributes:
label: Additional
description: πŸ“ Anything else you would like to share?

- type: checkboxes
attributes:
label: Are you willing to submit a PR?
description: >
(Optional) Please consider submitting a [Pull Request](https://github.com/georgia-tech-db/eva/pulls) (PR) to help improve EVA DB for everyone, especially if you have a good understanding of how to implement a fix or feature.
(Optional) Please consider submitting a [Pull Request](https://github.com/georgia-tech-db/eva/pulls) (PR) to help improve EvaDB for everyone, especially if you have a good understanding of how to implement a fix or feature.
Please see our βœ… [Contributing Guide](https://github.com/georgia-tech-db/eva/pulls) to get started.
options:
- label: Yes I'd like to help by submitting a PR!
16 changes: 3 additions & 13 deletions .github/ISSUE_TEMPLATE/question.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
name: ❓ Question
description: Ask a EVA DB question
description: Ask a question on EvaDB
labels: [question]
body:
- type: markdown
attributes:
value: |
πŸ™ Thanks for asking a EVA DB Question!
- type: checkboxes
attributes:
label: Search before asking
description: >
πŸ” Please search the [issues](https://github.com/georgia-tech-db/eva/issues) to see if a similar question already exists.
πŸ” Please search our [issues](https://github.com/georgia-tech-db/eva/issues) to see if a similar question already exists.
options:
- label: >
I have searched the EVA DB [issues](https://github.com/georgia-tech-db/eva/issues) and found no similar questions.
I have searched the EvaDB [issues](https://github.com/georgia-tech-db/eva/issues) and found no similar questions.
required: true
- type: textarea
Expand All @@ -25,8 +20,3 @@ body:
πŸ’‘ ProTip! Include as much information as possible (screenshots, logs, tracebacks etc.) to receive the most helpful response.
validations:
required: true

- type: textarea
attributes:
label: Additional
description: πŸ“ Anything else you would like to share?
Loading

0 comments on commit 895771c

Please sign in to comment.