Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop es7 #18

Merged
merged 16 commits into from
Mar 31, 2020
Merged

Develop es7 #18

merged 16 commits into from
Mar 31, 2020

Conversation

DustinKLo
Copy link
Contributor

No description provided.

* added argument of _doc whenever it calls hysds_commons.hysds_io_utils

to preserve the functionality of es1.7 and es7.1
removal of mapping types, are now defaulted to _doc in es7

added gitignore stufff

* added new es7 compatible template for config/es_template.json

* added headers to /scripts/install_es_template.py
* added argument of _doc whenever it calls hysds_commons.hysds_io_utils

to preserve the functionality of es1.7 and es7.1
removal of mapping types, are now defaulted to _doc in es7

added gitignore stufff

* added new es7 compatible template for config/es_template.json

* added headers to /scripts/install_es_template.py

* removed doctype from uploadinng doc in lib/dataset.py

* fixed es_template.json

* edited setup.py to update elasticsearch library to 7
* changes to make geonames compatible with es7

* fixed mappign in import_ES.py

* removed geonames type in mappingn, using _doc now. added print statements
* inital commit for HC-134 ticket

* correct field for retrieving on demand jobs

* sorting job api by label

* get job param api

* submit job and added label for job list

* removed note in grq2 api
* initial commit for user rules changes

* added list of TODOs to grq2 api

* add user rule (work in progress)

* user rules post rest api

* fixed import in api

* get_by_id_safe -> get_by_id

* fixed REST API and added missing params list for creating user_rules

* fixing missing params

* renamed post_data -> request_data and added edit user_rule put api

* editing user rules put rest api more flexible

* added delete for user rules REST API

fixed bugs and made it more concise

* added job_spec in user_rule

* fixed put user rule api, added more fields

* added refresh to create user rule rest API

* fixed or filter in geonames and added validation to query_string param in user rules REST API

* es.count instead of es.search for checking if user rula already exists

* fixing error handling in the user rules rest api

* added minimum_should_match to geonames multipolygon
* removed es_type from api_v01.py

* added all APIs from v0.1 to v0.2

refactored HySDSIO class API to be more restful and consolidated
removed useless import statements
* initial commit for consolidating hysds_io and user_rules indexes

* refactored API V01 and V02 to use the elasticsearch wrapper

refactored rest APIs to use hysds_io_grq and user_rules_grq index in Mozart's ES
moved hysds_io_grq index and user_rules_grq index names to settings.cfg.tmpl

* small code cleanup in copy_user_rules.py to make it more readable

not sure if we actually use that code (maybe in sds cli) will revisit this maybe later when working on exporting user rules

* fixed conflicting api rest endpoints (v0.2)

* fixed small bugs in user rules update
* moved tosca user rules scripts from tosca to grq2

* fixed user_rules_mapping path in create_user_rules_index.py
@DustinKLo DustinKLo requested a review from pymonger March 30, 2020 23:23
@DustinKLo DustinKLo merged commit 3d5371a into develop Mar 31, 2020
@DustinKLo DustinKLo deleted the develop-es7 branch March 31, 2020 01:09
DustinKLo added a commit that referenced this pull request Mar 31, 2020
* Hc 123 container builder (#7)

* added argument of _doc whenever it calls hysds_commons.hysds_io_utils

to preserve the functionality of es1.7 and es7.1
removal of mapping types, are now defaulted to _doc in es7

added gitignore stufff

* added new es7 compatible template for config/es_template.json

* added headers to /scripts/install_es_template.py

* Hc 124 ingest dataset (#8)

* added argument of _doc whenever it calls hysds_commons.hysds_io_utils

to preserve the functionality of es1.7 and es7.1
removal of mapping types, are now defaulted to _doc in es7

added gitignore stufff

* added new es7 compatible template for config/es_template.json

* added headers to /scripts/install_es_template.py

* removed doctype from uploadinng doc in lib/dataset.py

* fixed es_template.json

* edited setup.py to update elasticsearch library to 7

* Hc 126 geonames (#9)

* changes to make geonames compatible with es7

* fixed mappign in import_ES.py

* removed geonames type in mappingn, using _doc now. added print statements

* Hc 134 ondemand (#10)

* inital commit for HC-134 ticket

* correct field for retrieving on demand jobs

* sorting job api by label

* get job param api

* submit job and added label for job list

* removed note in grq2 api

* Hc 142 user rules (#11)

* initial commit for user rules changes

* added list of TODOs to grq2 api

* add user rule (work in progress)

* user rules post rest api

* fixed import in api

* get_by_id_safe -> get_by_id

* fixed REST API and added missing params list for creating user_rules

* fixing missing params

* renamed post_data -> request_data and added edit user_rule put api

* editing user rules put rest api more flexible

* added delete for user rules REST API

fixed bugs and made it more concise

* added job_spec in user_rule

* fixed put user rule api, added more fields

* added refresh to create user rule rest API

* fixed or filter in geonames and added validation to query_string param in user rules REST API

* es.count instead of es.search for checking if user rula already exists

* fixing error handling in the user rules rest api

* added minimum_should_match to geonames multipolygon

* added hysds_io field to post user rules rest api

* added more validation in the on demand submission rest API

* removed es_type from api_v01.py (#12)

* removed es_type from api_v01.py

* added all APIs from v0.1 to v0.2

refactored HySDSIO class API to be more restful and consolidated
removed useless import statements

* Hc 163 container builder (#13)

* initial commit for consolidating hysds_io and user_rules indexes

* refactored API V01 and V02 to use the elasticsearch wrapper

refactored rest APIs to use hysds_io_grq and user_rules_grq index in Mozart's ES
moved hysds_io_grq index and user_rules_grq index names to settings.cfg.tmpl

* small code cleanup in copy_user_rules.py to make it more readable

not sure if we actually use that code (maybe in sds cli) will revisit this maybe later when working on exporting user rules

* fixed conflicting api rest endpoints (v0.2)

* fixed small bugs in user rules update

* HC-170: dsl (#14)

* moved tosca user rules scripts from tosca to grq2

* fixed user_rules_mapping path in create_user_rules_index.py

* fix conflixts

* added flask-cors, will remove later

* removed hysds_io from user_rules and added job_spec to user_rules_mapping (#17)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants