use jobid to fetch job info (#313)

when groupid is invalid , it will fetch all user`s jobs without groupid limitation.
deepmodeling · Mar 22, 2023 · 2282872 · 2282872
2 parents 2efa376 + 900ed76
commit 2282872
Showing 1 changed file with 18 additions and 21 deletions.
diff --git a/dpdispatcher/dp_cloud_server_context.py b/dpdispatcher/dp_cloud_server_context.py
@@ -157,31 +157,28 @@ def upload(self, submission):
     def download(self, submission):
         jobs = submission.belonging_jobs
         job_hashs = {}
-        group_id = None
         job_infos = {}
+        job_result = []
         for job in jobs:
             ids = job.job_id.split(":job_group_id:")
-            jid, gid = int(ids[0]), int(ids[1])
+            jid = int(ids[0])
             job_hashs[jid] = job.job_hash
-            group_id = gid
-        if group_id is not None:
-            job_result = self.api.get_tasks_list(group_id)
-            for each in job_result:
-                if (
-                    "resultUrl" in each
-                    and each["resultUrl"] != ""
-                    and each["status"] == 2
-                ):
-                    job_hash = ""
-                    if each["id"] not in job_hashs:
-                        dlog.info(
-                            f"find unexpect job_hash, but task {each['id']} still been download."
-                        )
-                        dlog.debug(str(job_hashs))
-                        job_hash = str(each["id"])
-                    else:
-                        job_hash = job_hashs[each["id"]]
-                    job_infos[job_hash] = each
+            jobinfo = self.api.get_job_detail(jid)
+            job_result.append(jobinfo)
+        # if group_id is not None:
+        #     job_result = self.api.get_tasks_list(group_id)
+        for each in job_result:
+            if "resultUrl" in each and each["resultUrl"] != "" and each["status"] == 2:
+                job_hash = ""
+                if each["id"] not in job_hashs:
+                    dlog.info(
+                        f"find unexpect job_hash, but task {each['id']} still been download."
+                    )
+                    dlog.debug(str(job_hashs))
+                    job_hash = str(each["id"])
+                else:
+                    job_hash = job_hashs[each["id"]]
+                job_infos[job_hash] = each
         bar_format = "{l_bar}{bar}| {n:.02f}/{total:.02f} %  [{elapsed}<{remaining}, {rate_fmt}{postfix}]"
         for job_hash, info in tqdm.tqdm(
             job_infos.items(),