Skip to content

Commit a1c7336

Browse files
committed
python and mongodb version update. fix datarun fetch bug
1 parent aecd050 commit a1c7336

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ init-db: clean-db
6161
load-db: init-db ## load the demo dataset (NASA)
6262
curl -o sintel.tar.bz2 "https://sintel-db.s3.us-east-2.amazonaws.com/sintel.tar.bz2"
6363
tar -xf sintel.tar.bz2 -C ./db-instance/data/ && rm sintel.tar.bz2
64-
mongo sintel --eval "db.dropDatabase()"
64+
mongosh sintel --eval "db.dropDatabase()"
6565
mongorestore --db sintel ./db-instance/data/sintel/
6666

6767
.PHONY: load-db-test
6868
load-db-test: init-db ## load the demo testing dataset for pytest
6969
curl -o sintel_test.tar.bz2 "https://d3-ai-sintel.s3.us-east-2.amazonaws.com/sintel_test.tar.bz2"
7070
tar -xf sintel_test.tar.bz2 -C ./db-instance/data/ && rm sintel_test.tar.bz2
71-
mongo sintel_test --eval "db.dropDatabase()"
71+
mongosh sintel_test --eval "db.dropDatabase()"
7272
mongorestore --db sintel_test ./db-instance/data/sintel_test/
7373

7474
# ------------------ session: docker ------------------- #

README.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
Make sure you have installed all of the following prerequisites on your development machine:
2828

29-
- **Python (>= 3.0)** - Sintel has been developed and runs on [Python 3.6](https://www.python.org/downloads/release/python-360/). Although it is not strictly required, the usage of a [virtualenv](https://virtualenv.pypa.io/en/latest/) is highly recommended in order to avoid interfering with other software installed in the system where **MTV** is run. To this end, [Anaconda python](https://www.anaconda.com/distribution/#download-section) is suggested to maintain the virtual environments.
29+
- **Python (>= 3.8)** - Sintel has been developed and runs on [Python 3.8](https://www.python.org/downloads/release/python-360/). Although it is not strictly required, the usage of a [virtualenv](https://virtualenv.pypa.io/en/latest/) is highly recommended in order to avoid interfering with other software installed in the system where **MTV** is run. To this end, [Anaconda python](https://www.anaconda.com/distribution/#download-section) is suggested to maintain the virtual environments.
3030
- **Git** - [Download & Install Git](https://git-scm.com/downloads). OSX and Linux machines typically have this already installed.
31-
- **MongoDB (>= 3.6)** - [Download & Install MongoDB](http://www.mongodb.org/downloads), and make sure it's running on the default port (27017).
31+
- **MongoDB (>= 4.4)** - [Download & Install MongoDB](http://www.mongodb.org/downloads), and make sure it's running on the default port (27017).
3232

3333
## Get Started
3434

@@ -48,6 +48,11 @@ dependencies for code linting and testing
4848
$ make install-develop
4949
```
5050

51+
Download demo data and load it to the mongodb. The database name by default is `sintel`.
52+
```bash
53+
$ make load-db
54+
```
55+
5156
### Running Your Application
5257

5358
Please activate your virtualenv, and then launch the API server:
@@ -66,17 +71,10 @@ Run the following command for the purpose of development
6671
$ sintel run -E development -v
6772
```
6873

69-
### Data
70-
71-
The command `make install` or `make install-develop` has already pull the demo dataset and restore it into MongoDB. The database name by default is `sintel`.
74+
### Use Your Own Data
7275

73-
##### Working with [Orion](https://github.com/D3-AI/Orion) to generate your own data
7476

75-
You can type the following command to update the data from Orion to Sintel-supported formats. Note that you can configure the mongodb in the file `./sintel/config.yaml`.
76-
77-
```bash
78-
$ sintel update db -v
79-
```
77+
Follow the tutorial `.tutorials/Anomaly Detection.ipynb` for detail.
8078

8179

8280
## Use Docker to deploy

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
install_requires = [
2121
# Sintel
22-
'orion-ml==0.5.2',
23-
# 'orion-ml@git+https://git@github.com/sintel-dev/Orion.git',
22+
# 'orion-ml==0.5.2',
23+
'orion-ml@git+https://git@github.com/sintel-dev/Orion.git@sintel#egg=orion-ml',
2424
# General
2525
'termcolor==1.1.0',
2626
'PyYAML==5.1',
@@ -41,7 +41,7 @@
4141
'itsdangerous==2.0.1',
4242
'MarkupSafe==2.0.1',
4343
'requests==2.24.0',
44-
'Werkzeug==0.15.5',
44+
'Werkzeug>=0.15.5',
4545
'gevent>=21.12.0',
4646
'flasgger==0.9.5',
4747
'Jinja2>=2.10,<3.1',

sintel/resources/datarun.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414

1515
def get_signalrun(signalrun_doc):
1616

17-
primitive_name = ('mlprimitives.custom.timeseries_preprocessing'
17+
primitive_name = ('mlstars.custom.timeseries_preprocessing'
1818
'.time_segments_aggregate#1')
19+
print(primitive_name)
1920
pipeline = signalrun_doc.datarun.pipeline
2021
interval = int(pipeline.json['hyperparameters']
2122
[primitive_name].get('interval', None))

0 commit comments

Comments
 (0)