Merge pull request #11 from dingzhaohan/main

sandbox job

Author: dingzhaohan

src/bohrium/resources/job/job.py

@@ -14,6 +14,7 @@
 
 
 log = logging.getLogger(__name__)
+USE_SANDBOX = os.getenv("BOHRIUM_USE_SANDBOX") in ["1", "true"]
 
 
 class Job(SyncAPIResource):
@@ -27,15 +28,15 @@ def create(self, project_id, name='', group_id=0):
         if group_id:
             data['bohrGroupId'] = group_id
         try:
-            data = self._client.post(f'/openapi/v1/job/create', json=data, params=self._client.params)
+            data = self._client.post(f'/openapi/v1/sandbox/job/create' if USE_SANDBOX else f'/openapi/v1/job/create', json=data, params=self._client.params)
             data = data.json()
         except Exception as e:
             raise e
         return data.get("data", {})
 
     def detail(self, job_id):
         log.info(f"detail job {job_id}")
-        response = self._client.get(f"/openapi/v1/job/{job_id}")
+        response = self._client.get(f"/openapi/v1/sandbox/job/{job_id}" if USE_SANDBOX else f"/openapi/v1/job/{job_id}")
 
         log.info(response.json())
         log.debug(response)
@@ -95,28 +96,29 @@ def insert(self, **kwargs):
             camel_data['logFiles'] = camel_data['logFile']
         if 'logFiles' in camel_data and not isinstance(camel_data['logFiles'], list):
             camel_data['logFiles'] = [camel_data['logFiles']]
-        response = self._client.post("/openapi/v2/job/add", json=camel_data)
+        response = self._client.post("/openapi/v1/sandbox/job/add" if USE_SANDBOX else "/openapi/v2/job/add", json=camel_data)
+        log.info(f'[insert] json={camel_data}, response={response.json()}')
         return response.json().get("data")
 
     def delete(self, job_id):
         # log.info(f"delete job {job_id}")
-        response = self._client.post(f"/openapi/v1/job/del/{job_id}")
+        response = self._client.post(f"/openapi/v1/sandbox/job/del/{job_id}" if USE_SANDBOX else f"/openapi/v1/job/del/{job_id}")
 
 
     def terminate(self, job_id):
         # log.info(f"terminate job {job_id}")
-        response = self._client.post(f"/openapi/v1/job/terminate/{job_id}")
+        response = self._client.post(f"/openapi/v1/sandbox/job/terminate/{job_id}" if USE_SANDBOX else f"/openapi/v1/job/terminate/{job_id}")
 
 
     def kill(self, job_id):
         # log.info(f"kill job {job_id}")
-        response = self._client.post(f"/openapi/v1/job/kill/{job_id}")
+        response = self._client.post(f"/openapi/v1/sandbox/job/kill/{job_id}" if USE_SANDBOX else f"/openapi/v1/job/kill/{job_id}")
 
 
     def log(self, job_id, log_file="STDOUTERR", page=-1, page_size=8192):
         # log.info(f"log job {job_id}")
         response = self._client.get(
-            f"/openapi/v1/job/{job_id}/log",
+            f"/openapi/v1/sandbox/job/{job_id}/log" if USE_SANDBOX else f"/openapi/v1/job/{job_id}/log",
             params={"logFile": log_file, "page": page, "pageSize": page_size},
         )
 
@@ -146,7 +148,7 @@ def create_job(
             "name": name,
             "bohrGroupId": group_id,
         }
-        response = self._client.post(f"/openapi/v1/job/create", json=data)
+        response = self._client.post(f"/openapi/v1/sandbox/job/create" if USE_SANDBOX else f"/openapi/v1/job/create", json=data)
 
         return response.json().get("data")
 

src/bohrium/resources/tiefblue/tiefblue.py

@@ -180,7 +180,7 @@ def upload_From_file_multi_part(
                 pbar.close()
                 return
             chunks = split_size_by_part_size(size, chunk_size)
-            initial_key = self.init_upload_by_part(object_key, parameter, token).get('initialKey')
+            initial_key = self.init_upload_by_part(object_key, parameter, token).json()['data'].get('initialKey')
             part_string = []
             uploaded = 0
             for c in chunks:
@@ -190,7 +190,7 @@ def upload_From_file_multi_part(
                     object_key, initial_key, chunk_size=c.Size, number=c.Number,
                     body=chunk_data, token=token
                 )
-                part_string.append(resp.get('partString'))
+                part_string.append(resp.json()['data'].get('partString'))
                 uploaded += c.Size
                 percent = uploaded * 100 / size
                 pbar.n = percent
@@ -214,7 +214,6 @@ def download_from_url(self, url, save_file):
                 break
             else:
                 time.sleep(retry_count)
-                ret = None
         if ret is not None:
             ret.raise_for_status()
             with open(save_file, "wb") as f: