Skip to content

Commit

Permalink
Fix deleting keys via CLI
Browse files Browse the repository at this point in the history
  • Loading branch information
ElliottKasoar committed Apr 29, 2024
1 parent a6fcc4f commit aae0e96
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions abcd/frontends/commandline/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import numpy as np

from abcd.frontends.commandline.decorators import check_remote, init_config, init_db
from abcd.backends.atoms_opensearch import OpenSearchDatabase

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -221,7 +222,13 @@ def key_delete(*, db, query, yes, keys, **kwargs):
keys = " ".join(keys)
data = parser.parse(keys)

query = ("AND", query, ("OR", *(("NAME", key) for key in data.keys())))
if isinstance(db, OpenSearchDatabase):
query = [
f"{query} AND ({' OR '.join([f'{key}:*' for key in data.keys()])})"
for query in query
]
else:
query = ("AND", query, ("OR", *(("NAME", key) for key in data.keys())))

if not yes:
print(
Expand All @@ -231,7 +238,7 @@ def key_delete(*, db, query, yes, keys, **kwargs):
)
exit(1)

for k in keys:
for k in data.keys():
db.delete_property(k, query=query)


Expand Down

0 comments on commit aae0e96

Please sign in to comment.