From 209f32a7de23ec3006a8d68b8422540357a83a6e Mon Sep 17 00:00:00 2001 From: Ari Brown Date: Mon, 21 Aug 2023 09:34:16 -0400 Subject: [PATCH] add a check to support errors being raised before tempfiles are created --- minerva/athena.py | 15 ++++++--------- pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/minerva/athena.py b/minerva/athena.py index a1f388e..fef820c 100644 --- a/minerva/athena.py +++ b/minerva/athena.py @@ -112,8 +112,6 @@ class Query(Execute): files = self.handler.s3.read(manif).split("\n") files = [f.strip() for f in files if f.strip()] # filter empty - self.files = files - return files else: print("Error") @@ -125,11 +123,9 @@ class Query(Execute): # dataset of the results. # Calls `self.manifest_files()` which blocks via `self.finish()` def results(self): - start = time.time() - local = [self.handler.s3.download(f) for f in self.manifest_files()] - #local = parallel_map(self.handler.s3.download, self.manifest_files()) - print(time.time() - start) - self.ds = pa.dataset.dataset(local) + self.temps = [self.handler.s3.download(f) for f in self.manifest_files()] + #local = parallel_map(self.handler.s3.download, self.manifest_files()) + self.ds = pa.dataset.dataset(self.temps) return self.ds def __enter__(self): @@ -139,6 +135,7 @@ class Query(Execute): self.close() def close(self): - for file in self.files: - os.remove(file) + if self.temps: + for file in self.temps: + os.remove(file) diff --git a/pyproject.toml b/pyproject.toml index 0438cd8..32d4933 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "minerva" -version = "0.3.4" +version = "0.3.5" description = "Easier access to AWS Athena and Redshift" authors = [ "Ari Brown ",