Skip to content

Commit

Permalink
Fix python black linting erros
Browse files Browse the repository at this point in the history
  • Loading branch information
@drotheram @wkhchow
drotheram authored and wkhchow committed Jun 3, 2022
1 parent 5d4884d commit 2a7d7ba
Show file tree
Hide file tree
Showing 32 changed files with 894 additions and 1,337 deletions.
13 changes: 7 additions & 6 deletions python/createESAlias.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,18 @@ def get_config_params(args):
return configParseObj


auth = get_config_params('config.ini')
auth = get_config_params("config.ini")

es = Elasticsearch([auth.get('es', 'es_endpoint')],
http_auth=(auth.get('es', 'es_un'),
auth.get('es', 'es_pw')))
es = Elasticsearch(
[auth.get("es", "es_endpoint")],
http_auth=(auth.get("es", "es_un"), auth.get("es", "es_pw")),
)

indexList = es.cat.indices(index='*_v1.4.0', h='index', s='index:desc').split()
indexList = es.cat.indices(index="*_v1.4.0", h="index", s="index:desc").split()

for index in indexList:
# print(index)
# print(index.rsplit("_", 1)[0])
indexBaseName = index.rsplit("_", 1)[0]+"test_alias"
indexBaseName = index.rsplit("_", 1)[0] + "test_alias"
# print(index.split("_")[0:-1].join())
es.indices.put_alias(index=index, name=indexBaseName)
21 changes: 7 additions & 14 deletions python/dsraAllScenariosCduid_postgres2es.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,24 @@
def main():
table = utils.PostGISdataset(
utils.PostGISConnection(),
utils.ESConnection(settings={
'settings': {
'number_of_shards': 1,
'number_of_replicas': 0
},
'mappings': {
'properties': {
'geometry': {
'type': 'geo_shape'
}
}
utils.ESConnection(
settings={
"settings": {"number_of_shards": 1, "number_of_replicas": 0},
"mappings": {"properties": {"geometry": {"type": "geo_shape"}}},
}
}),
),
view="opendrr_dsra_all_scenarios_cduid",
sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \
FROM dsra.dsra_all_scenarios_cduid \
ORDER BY dsra_all_scenarios_cduid."cduid" \
LIMIT {limit} \
OFFSET {offset}'
OFFSET {offset}',
)

table.postgis2es()

return


if __name__ == '__main__':
if __name__ == "__main__":
main()
21 changes: 7 additions & 14 deletions python/dsraAllScenariosCsduid_postgres2es.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,24 @@
def main():
table = utils.PostGISdataset(
utils.PostGISConnection(),
utils.ESConnection(settings={
'settings': {
'number_of_shards': 1,
'number_of_replicas': 0
},
'mappings': {
'properties': {
'geometry': {
'type': 'geo_shape'
}
}
utils.ESConnection(
settings={
"settings": {"number_of_shards": 1, "number_of_replicas": 0},
"mappings": {"properties": {"geometry": {"type": "geo_shape"}}},
}
}),
),
view="opendrr_dsra_all_scenarios_csduid",
sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \
FROM dsra.dsra_all_scenarios_csduid \
ORDER BY dsra_all_scenarios_csduid."csduid" \
LIMIT {limit} \
OFFSET {offset}'
OFFSET {offset}',
)

table.postgis2es()

return


if __name__ == '__main__':
if __name__ == "__main__":
main()
21 changes: 7 additions & 14 deletions python/dsraAllScenariosDauid_postgres2es.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,24 @@
def main():
table = PostGISdataset(
PostGISConnection(),
ESConnection(settings={
'settings': {
'number_of_shards': 1,
'number_of_replicas': 0
},
'mappings': {
'properties': {
'geometry': {
'type': 'geo_shape'
}
}
ESConnection(
settings={
"settings": {"number_of_shards": 1, "number_of_replicas": 0},
"mappings": {"properties": {"geometry": {"type": "geo_shape"}}},
}
}),
),
view="opendrr_dsra_all_scenarios_dauid",
sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \
FROM dsra.dsra_all_scenarios_dauid \
ORDER BY dsra_all_scenarios_dauid."dauid" \
LIMIT {limit} \
OFFSET {offset}'
OFFSET {offset}',
)

table.postgis2es()

return


if __name__ == '__main__':
if __name__ == "__main__":
main()
21 changes: 7 additions & 14 deletions python/dsraAllScenariosEruid_postgres2es.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,24 @@
def main():
eruidTable = utils.PostGISdataset(
utils.PostGISConnection(),
utils.ESConnection(settings={
'settings': {
'number_of_shards': 1,
'number_of_replicas': 0
},
'mappings': {
'properties': {
'geometry': {
'type': 'geo_shape'
}
}
utils.ESConnection(
settings={
"settings": {"number_of_shards": 1, "number_of_replicas": 0},
"mappings": {"properties": {"geometry": {"type": "geo_shape"}}},
}
}),
),
view="opendrr_dsra_all_scenarios_eruid",
sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \
FROM dsra.dsra_all_scenarios_eruid \
ORDER BY dsra_all_scenarios_eruid."eruid" \
LIMIT {limit} \
OFFSET {offset}'
OFFSET {offset}',
)

eruidTable.postgis2es()

return


if __name__ == '__main__':
if __name__ == "__main__":
main()
21 changes: 7 additions & 14 deletions python/dsraAllScenariosSauid_postgres2es.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,24 @@
def main():
table = PostGISdataset(
PostGISConnection(),
ESConnection(settings={
'settings': {
'number_of_shards': 1,
'number_of_replicas': 0
},
'mappings': {
'properties': {
'geometry': {
'type': 'geo_shape'
}
}
ESConnection(
settings={
"settings": {"number_of_shards": 1, "number_of_replicas": 0},
"mappings": {"properties": {"geometry": {"type": "geo_shape"}}},
}
}),
),
view="opendrr_dsra_all_scenarios_sauid",
sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \
FROM dsra.dsra_all_scenarios_sauid \
ORDER BY dsra_all_scenarios_sauid."sauid" \
LIMIT {limit} \
OFFSET {offset}'
OFFSET {offset}',
)

table.postgis2es()

return


if __name__ == '__main__':
if __name__ == "__main__":
main()
33 changes: 14 additions & 19 deletions python/dsraExtents_postgres2es.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,36 @@

def main():

config = utils.get_config_params('config.ini')
version = config.get('es', 'version')
config = utils.get_config_params("config.ini")
version = config.get("es", "version")

dsraTable = utils.PostGISdataset(
utils.PostGISConnection(),
utils.ESConnection(settings={
'settings': {
'number_of_shards': 1,
'number_of_replicas': 0
},
'mappings': {
'properties': {
'geometry': {
'type': 'geo_shape'
}
}
utils.ESConnection(
settings={
"settings": {"number_of_shards": 1, "number_of_replicas": 0},
"mappings": {"properties": {"geometry": {"type": "geo_shape"}}},
}
}),
),
view="opendrr_shakemap_scenario_extents_{}".format(version),
sqlquerystring='SELECT *, ST_AsGeoJSON(geom) \
sqlquerystring="SELECT *, ST_AsGeoJSON(geom) \
FROM gmf.shakemap_scenario_extents \
LIMIT {limit} \
OFFSET {offset}'
OFFSET {offset}",
)
dsraTable.postgis2es()
return


def parse_args():
parser = argparse.ArgumentParser(description='''
Create ES index with DSRA Scenario Extents''')
parser = argparse.ArgumentParser(
description="""
Create ES index with DSRA Scenario Extents"""
)
args = parser.parse_args()

return args


if __name__ == '__main__':
if __name__ == "__main__":
main()
Loading

0 comments on commit 2a7d7ba

Please sign in to comment.