Skip to content

Commit

Permalink
Merge pull request #815 from materialsproject/bugfix/store_conn
Browse files Browse the repository at this point in the history
Check for collection before closing in resources
  • Loading branch information
munrojm committed Jul 6, 2023
2 parents 1b5aaf2 + f7cc1cb commit 64df9f3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/maggma/api/resource/post_resource.py
Expand Up @@ -144,8 +144,8 @@ def search(**queries: Dict[str, STORE_PARAMS]) -> Dict:
detail="Server timed out trying to obtain data. Try again with a smaller request, "
"or remove sorting fields and sort data locally.",
)

self.store.close()
if self.store._coll:
self.store.close()

operator_meta = {}

Expand Down
6 changes: 4 additions & 2 deletions src/maggma/api/resource/read_resource.py
Expand Up @@ -168,7 +168,8 @@ def get_by_key(
detail=f"Item with {self.store.key} = {key} not found",
)

self.store.close()
if self.store._coll:
self.store.close()

for operator in self.query_operators:
item = operator.post_process(item, {})
Expand Down Expand Up @@ -275,7 +276,8 @@ def search(**queries: Dict[str, STORE_PARAMS]) -> Union[Dict, Response]:
" or remove sorting fields and sort data locally.",
)

self.store.close()
if self.store._coll:
self.store.close()

operator_meta = {}

Expand Down
3 changes: 2 additions & 1 deletion src/maggma/api/resource/s3_url.py
Expand Up @@ -114,7 +114,8 @@ def get_by_key(
),
)

self.store.close()
if self.store._coll:
self.store.close()

requested_datetime = datetime.utcnow()
expiry_datetime = requested_datetime + timedelta(seconds=self.url_lifetime)
Expand Down
6 changes: 4 additions & 2 deletions src/maggma/api/resource/submission.py
Expand Up @@ -174,7 +174,8 @@ def get_by_key(
detail=f"Item with submission ID = {key} not found",
)

self.store.close()
if self.store._coll:
self.store.close()

for operator in self.get_query_operators: # type: ignore
item = operator.post_process(item, {})
Expand Down Expand Up @@ -257,7 +258,8 @@ def search(**queries: STORE_PARAMS):
"or remove sorting fields and sort data locally.",
)

self.store.close()
if self.store._coll:
self.store.close()

meta = Meta(total_doc=count)

Expand Down

0 comments on commit 64df9f3

Please sign in to comment.