Mount directory the topic file is in as volume rather than fixed directory (#86)

Ryan Clancy · web-flow · commit ca3198704795 · 2019-06-05T12:54:37.000-04:00
diff --git a/manager.py b/manager.py
@@ -1,5 +1,4 @@
 import hashlib
-import os
 
 import docker
 
@@ -8,10 +7,8 @@
 from searcher import Searcher
 from trainer import Trainer
 
-TOPIC_PATH_HOST = os.path.abspath("topics")
-TOPIC_PATH_GUEST = "/input/topics/"
-
 COLLECTION_PATH_GUEST = "/input/collections/"
+TOPIC_PATH_GUEST = "/input/topics/"
 OUTPUT_PATH_GUEST = "/output"
 
 TEST_SPLIT_PATH_GUEST = '/data/splits/test_split.txt'
@@ -48,14 +45,12 @@ def prepare(self, preparer_config=None):
     def search(self, searcher_config=None):
         if searcher_config:
             self.set_searcher_config(searcher_config)
-        self.searcher.search(self.client, OUTPUT_PATH_GUEST, TOPIC_PATH_HOST, TOPIC_PATH_GUEST, TEST_SPLIT_PATH_GUEST,
-                             self.generate_save_tag)
+        self.searcher.search(self.client, OUTPUT_PATH_GUEST, TOPIC_PATH_GUEST, TEST_SPLIT_PATH_GUEST, self.generate_save_tag)
 
     def train(self, trainer_config=None):
         if trainer_config:
             self.set_trainer_config(trainer_config)
-        self.trainer.train(self.client, TOPIC_PATH_GUEST, TEST_SPLIT_PATH_GUEST, VALIDATION_SPLIT_PATH_GUEST,
-                           self.generate_save_tag)
+        self.trainer.train(self.client, TOPIC_PATH_GUEST, TEST_SPLIT_PATH_GUEST, VALIDATION_SPLIT_PATH_GUEST, self.generate_save_tag)
 
     def interact(self, interactor_config=None):
         if interactor_config:
diff --git a/searcher.py b/searcher.py
@@ -13,8 +13,7 @@ def __init__(self, searcher_config=None):
     def set_config(self, searcher_config):
         self.config = searcher_config
 
-    def search(self, client, output_path_guest, topic_path_host, topic_path_guest,
-               test_split_path_guest, generate_save_tag):
+    def search(self, client, output_path_guest, topic_path_guest, test_split_path_guest, generate_save_tag):
         """
         Runs the search and evaluates the results (run files placed into the /output directory) using trec_eval
         """
@@ -24,20 +23,21 @@ def search(self, client, output_path_guest, topic_path_host, topic_path_guest,
         if not exists:
             sys.exit("Must prepare image first...")
 
+        topic_path_host = os.path.dirname(os.path.abspath(self.config.topic))
+
         volumes = {
             os.path.abspath(self.config.output): {
                 "bind": output_path_guest,
                 "mode": "rw"
             },
-            os.path.abspath(topic_path_host): {
+            topic_path_host: {
                 "bind": topic_path_guest,
                 "mode": "ro"
             }
         }
 
         if len(self.config.test_split) > 0:
-            volumes[os.path.abspath(self.config.test_split)] = {
-                "bind": test_split_path_guest, "mode": "ro"}
+            volumes[os.path.abspath(self.config.test_split)] = {"bind": test_split_path_guest, "mode": "ro"}
 
         search_args = {
             "collection": {
