download analysis

src/Surveyor.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 from arxiv_public_data.fulltext import convert_directory_parallel
 from arxiv_public_data import internal_citations
 import torch
@@ -1329,7 +1330,7 @@ class Surveyor:
         self.print_fn("outputs: " + outputs)
         return outputs
 
-    def zip_outputs(self, dump_dir, query):
+    def zip_outputs(self, dump_dir, zip_name):
         import zipfile
         def zipdir(path, ziph):
             # ziph is zipfile handle
@@ -1339,10 +1340,9 @@ class Surveyor:
                                os.path.relpath(os.path.join(root, file),
                                                os.path.join(path, '../..')))
 
-        zip_name = 'arxiv_dumps_'+query.replace(' ', '_')+'.zip'
+        
         zipf = zipfile.ZipFile(zip_name, 'w', zipfile.ZIP_DEFLATED)
         zipdir(dump_dir, zipf)
-        return zip_name
 
     def survey(self, query=None, id_list=None, max_search=None, num_papers=None, debug=False, weigh_authors=False):
         import joblib
@@ -1468,17 +1468,21 @@ class Surveyor:
             query = self.generate_title(' '.join([v for v in clustered_sections.values()]))
 
         survey_file = 'A_Survey_on_' + query.replace(' ', '_') + '.txt'
-        self.build_doc(clustered_sections, papers_standardized, query=query, filename=self.dump_dir + survey_file)
+        survey_file = Path(self.dump_dir).resolve() / survey_file
+        self.build_doc(clustered_sections, papers_standardized, query=query, filename=str(survey_file))
 
         self.survey_print_fn("\n-citation-network: ")
         self.survey_print_fn(cites)
 
         shutil.copytree('arxiv_data/', self.dump_dir + '/arxiv_data/')
-        shutil.copy(self.dump_dir + survey_file, survey_file)
         assert (os.path.exists(survey_file))
+        
+        zip_name = 'arxiv_dumps_'+query.replace(' ', '_')+'.zip'
+        zip_name = Path(self.dump_dir).parent.resolve() / zip_name
+        self.zip_outputs(self.dump_dir, str(zip_name))
+        self.print_fn("\n- Survey complete.. \nSurvey file path :" + str(survey_file) + 
+                      "\nAll outputs zip path :" + str(zipname))
+        
         self.print_fn(str(list(Path(self.dump_dir).resolve().glob('*'))))
-        output_zip = self.zip_outputs(self.dump_dir, query)
-        self.print_fn("\n- Survey complete.. \nSurvey file path :" + os.path.abspath(
-            survey_file) + "\nAll outputs zip path :" + os.path.abspath(self.dump_dir + output_zip))
 
-        return os.path.abspath(self.dump_dir + output_zip), os.path.abspath(survey_file)
+        return str(zip_name.resolve()), str(zipname.resolve())