Skip to content

Compatible for bohrium OpenAPI sandbox #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Nov 11, 2025
Merged

Compatible for bohrium OpenAPI sandbox #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aae7869
update bohrium sdk openapi
dp-dingzhaohan Jun 18, 2025
0a81a19
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 18, 2025
e82f431
support app-key
dp-dingzhaohan Jun 20, 2025
7e1dbcc
add app-key
dp-dingzhaohan Jun 23, 2025
2f110f1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 23, 2025
4271112
print detailed import error
njzjz Jun 24, 2025
bf2a23e
compatible for sandbox API in OpenAPI context
zjgemi Sep 23, 2025
d2ba339
Merge branch 'master' into sandbox
zjgemi Sep 24, 2025
a0b3b52
ignore exit code when ignore_exit_code=True
zjgemi Sep 25, 2025
46865e1
add real_user_id and session_id parameters
zjgemi Oct 15, 2025
8d121ff
Merge branch 'master' into sandbox
zjgemi Oct 27, 2025
4857458
remove duplicated line
njzjz Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dpdispatcher/contexts/openapi_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def upload_job(self, job, common_files=None):
object_key = os.path.join(data["storePath"], zip_filename) # type: ignore
job.upload_path = object_key
job.job_id = data["jobId"] # type: ignore
Comment on lines 170 to 172
Copy link
Contributor

@coderabbitai coderabbitai bot Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Inconsistent error handling for API response fields.

Lines 170 and 172 use direct indexing (data["storePath"], data["jobId"]) while lines 167, 168, and 173 use safe .get() access. If the API can omit jobGroupId, it may also omit storePath or jobId, leading to KeyError at runtime.

Apply this diff to use consistent safe access:

-        object_key = os.path.join(data["storePath"], zip_filename)  # type: ignore
+        object_key = os.path.join(data.get("storePath", ""), zip_filename)  # type: ignore
         job.upload_path = object_key
-        job.job_id = data["jobId"]  # type: ignore
+        job.job_id = data.get("jobId", "")  # type: ignore
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
object_key = os.path.join(data["storePath"], zip_filename) # type: ignore
job.upload_path = object_key
job.job_id = data["jobId"] # type: ignore
object_key = os.path.join(data.get("storePath", ""), zip_filename) # type: ignore
job.upload_path = object_key
job.job_id = data.get("jobId", "") # type: ignore
🤖 Prompt for AI Agents 
In dpdispatcher/contexts/openapi_context.py around lines 170 to 172, replace the
direct indexing data["storePath"] and data["jobId"] with safe .get() access
consistent with the surrounding code (e.g., data.get("storePath") and
data.get("jobId")); then handle the possibility of None by either raising a
clear ValueError or logging an error and providing a sensible default (or
aborting the operation) so a missing field does not cause an unhandled KeyError
at runtime.

job.jgid = data["jobGroupId"] # type: ignore
job.jgid = data.get("jobGroupId", "") # type: ignore
self.storage.upload_From_file_multi_part(
object_key=object_key, file_path=upload_zip, token=token
)
Expand Down
15 changes: 9 additions & 6 deletions dpdispatcher/machines/openapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,13 @@ def do_submit(self, job):
),
"out_files": self._gen_backward_files_list(job),
"platform": self.remote_profile.get("platform", "ali"),
"image_address": self.remote_profile.get("image_address", ""),
"image_name": self.remote_profile.get("image_address", ""),
}
if job.job_state == JobStatus.unsubmitted:
openapi_params["job_id"] = job.job_id
if "real_user_id" in self.remote_profile:
openapi_params["real_user_id"] = self.remote_profile["real_user_id"]
if "session_id" in self.remote_profile:
openapi_params["session_id"] = self.remote_profile["session_id"]
openapi_params["job_id"] = job.job_id
data = self.job.insert(**openapi_params)

job.job_id = data.get("jobId", 0) # type: ignore
Expand Down Expand Up @@ -182,8 +185,8 @@ def check_status(self, job):
self.ignore_exit_code,
)
if job_state == JobStatus.finished:
job_log = self.job.log(job_id)
if self.remote_profile.get("output_log"):
job_log = self.job.log(job_id)
print(job_log, end="")
self._download_job(job)
elif self.remote_profile.get("output_log") and job_state == JobStatus.running:
Expand All @@ -193,7 +196,7 @@ def check_status(self, job):

def _download_job(self, job):
data = self.job.detail(job.job_id)
job_url = data["jobFiles"]["outFiles"][0]["url"] # type: ignore
job_url = data["resultUrl"] # type: ignore
if not job_url:
return
job_hash = job.job_hash
Expand Down Expand Up @@ -243,7 +246,7 @@ def map_dp_job_state(status, exit_code, ignore_exit_code=True):
if status not in map_dict:
dlog.error(f"unknown job status {status}")
return JobStatus.unknown
if status == -1 and exit_code != 0 and ignore_exit_code:
if status == -1 and ignore_exit_code:
return JobStatus.finished
return map_dict[status]

Expand Down
Loading