Skip to content

Fix double job #158

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 4 commits into from
Oct 5, 2023
Merged

Fix double job #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92add72
Update ctl_commands.py
justinmerrell Oct 5, 2023
135ef4c
Update rp_job.py
justinmerrell Oct 5, 2023
4844e80
fix: handler called twice
justinmerrell Oct 5, 2023
84258ea
Merge pull request #157 from runpod/ignore-template
justinmerrell Oct 5, 2023
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
5 changes: 4 additions & 1 deletion runpod/api/ctl_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def create_pod(
cloud_type:str="ALL", support_public_ip:bool=True,
start_ssh:bool=True,
data_center_id : Optional[str]=None, country_code:Optional[str]=None,
gpu_count:int=1, volume_in_gb:int=0, container_disk_in_gb:int=5,
gpu_count:int=1, volume_in_gb:int=0, container_disk_in_gb:Optional[int]=None,
min_vcpu_count:int=1, min_memory_in_gb:int=1, docker_args:str="",
ports:Optional[str]=None, volume_mount_path:str="/runpod-volume",
env:Optional[dict]=None, template_id:Optional[str]=None,
Expand Down Expand Up @@ -117,6 +117,9 @@ def create_pod(
data_center_id = network_volume["dataCenterId"]
break

if container_disk_in_gb is None and template_id is None:
container_disk_in_gb = 10

raw_response = run_graphql_query(
pod_mutations.generate_pod_deployment_mutation(
name, image_name, gpu_type_id,
Expand Down
6 changes: 3 additions & 3 deletions runpod/serverless/modules/rp_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ async def run_job(handler: Callable, job: Dict[str, Any]) -> Dict[str, Any]:
run_result = {"error": "No output from handler."}

try:
job_output = await handler(job) if inspect.isawaitable(handler(job)) else handler(job)
handler_return = handler(job)
job_output = await handler_return if inspect.isawaitable(handler_return) else handler_return

log.debug(f'{job["id"]} | Handler output: {job_output}')

if isinstance(job_output, dict):
Expand All @@ -132,8 +134,6 @@ async def run_job(handler: Callable, job: Dict[str, Any]) -> Dict[str, Any]:
else:
run_result = {"output": job_output}



if run_result.get("output") == {}:
run_result.pop("output")

Expand Down