pxcloud/pkg-fetch
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: improve error handling in OpenAI API call and ensure proper response handling

Browse Source
This commit is contained in:
robertsLando 2025-08-28 14:14:28 +02:00
parent 081dc1ac7f
commit 2651325af6
No known key found for this signature in database
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/scripts/openai_resolver.py vendored
View File

@ -25,12 +25,16 @@ def call_openai_api(prompt, api_key, model="gpt-3.5-turbo"):
"max_tokens": 4000,
}
req = Request(url, data=json.dumps(data).encode("utf-8"), headers=headers)
with urlopen(req) as response:
result = json.loads(response.read().decode("utf-8"))
if "choices" in result and len(result["choices"]) > 0:
return result["choices"][0]["message"]["content"].strip()
try:
req = Request(url, data=json.dumps(data).encode("utf-8"), headers=headers)
with urlopen(req) as response:
result = json.loads(response.read().decode("utf-8"))
if "choices" in result and len(result["choices"]) > 0:
return result["choices"][0]["message"]["content"].strip()
else:
return None
except Exception as e:
print(f"OpenAI API error: {e}", file=sys.stderr)
return None
@ -77,6 +81,7 @@ Please analyze the rejected patch hunks and the current file content, then provi
Return ONLY the complete corrected file content, no explanations."""
print(f"Calling OpenAI API to resolve {original_file}...", file=sys.stderr)
resolved_content = call_openai_api(prompt, api_key)
if resolved_content:
@ -129,11 +134,11 @@ if __name__ == "__main__":
original_file = reject_file[:-4] # Remove .rej extension
print(f"Processing: {reject_file} -> {original_file}")
# Try to resolve with OpenAI
if resolve_conflict(reject_file, original_file, api_key):
conflicts_resolved += 1
else:
print(f"Failed to resolve {original_file}")
failed_files.append(original_file)
break
# Clean up reject file