update init and callback interface

Author: yodeng

setup.py

@@ -54,7 +54,7 @@ def version(self):
                     self.version_file = os.path.join(self.source_dir, f)
                     break
         if not os.path.isfile(self.version_file):
-            raise OSError("version not found")
+            raise IOError("version not found")
         with open(self.version_file) as fi:
             c = fi.read()
         exec(compile(c, self.version_file, "exec"), v)

src/job.py

@@ -365,7 +365,7 @@ def __init__(self, jobfile, mode=None, workdir=os.getcwd(), config=None):
             jobfile = tmp_jobfile
         self._path = abspath(jobfile)
         if not exists(self._path):
-            raise OSError("No such file: %s" % self._path)
+            raise IOError("No such file: %s" % self._path)
         self._pathdir = self.temp and self.workdir or dirname(self._path)
         self.logdir = join(self._pathdir, "log")
         self.mode = self.has_sge and (mode or "sge") or "localhost"

src/jobstat.py

@@ -169,11 +169,11 @@ def main():
         elif isdir(jobfile):
             logdir = abspath(jobfile)
         else:
-            raise OSError("No such file or directory %s." % jobfile)
+            raise IOError("No such file or directory %s." % jobfile)
 
         if not isdir(logdir):
             return
-            #raise OSError("No such log_dir %s" % logdir)
+            #raise IOError("No such log_dir %s" % logdir)
         if submit == 0:
             submit = len([i for i in os.listdir(
                 logdir) if i.endswith(".log")])

src/run.py

@@ -196,26 +196,38 @@ def check_already_success(self):
                 job.status = "wait"
 
     def init_callback(self):
-        for name in ["init", "call_back"]:
-            cmd = self.conf.rget("args", name)
-            if not cmd:
-                continue
+        self.add_init(self.conf.rget("args", "init"))
+        self.add_callback(self.conf.rget("args", "call_back"))
+
+    def add_init(self, init=""):
+        if init:
+            if "init" in self.totaljobdict:
+                job = self.totaljobdict["init"]
+                return self.logger.error("init '%s' exists", job.rawstring)
             job = Job(self.conf)
-            job = job.from_cmd(self.jfile, linenum=-1, cmd=cmd)
-            job.to_local(jobname=name, removelog=False)
-            self.totaljobdict[name] = job
-            if name == "init":
-                self.jobs.insert(0, job)
-                f = self.jobsgraph.ind_nodes()
-                self.jobsgraph.add_node_if_not_exists(job.jobname)
-                for j in f:
-                    self.jobsgraph.add_edge(name, j)
-            else:
-                self.jobs.append(job)
-                f = self.jobsgraph.end_nodes()
-                self.jobsgraph.add_node_if_not_exists(job.jobname)
-                for j in f:
-                    self.jobsgraph.add_edge(j, name)
+            job = job.from_cmd(self.jfile, linenum=-1, cmd=init)
+            job.to_local(jobname="init", removelog=False)
+            self.totaljobdict["init"] = job
+            self.jobs.insert(0, job)
+            ind_nodes = self.jobsgraph.ind_nodes()
+            self.jobsgraph.add_node_if_not_exists(job.jobname)
+            for j in ind_nodes:
+                self.jobsgraph.add_edge("init", j)
+
+    def add_callback(self, callback=""):
+        if callback:
+            if "callback" in self.totaljobdict:
+                job = self.totaljobdict["callback"]
+                return self.logger.error("callback '%s' exists", job.rawstring)
+            job = Job(self.conf)
+            job = job.from_cmd(self.jfile, linenum=-1, cmd=callback)
+            job.to_local(jobname="callback", removelog=False)
+            self.totaljobdict["callback"] = job
+            self.jobs.append(job)
+            end_nodes = self.jobsgraph.end_nodes()
+            self.jobsgraph.add_node_if_not_exists(job.jobname)
+            for j in end_nodes:
+                self.jobsgraph.add_edge(j, "callback")
 
     def log_status(self, job):
         name = job.jobname