Skip to content

fix: prevent crash when platform.architecture() is not allowed #1120

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.

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 1 commit into from
Feb 4, 2024
Merged
Changes from all commits
Commits
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
34 changes: 28 additions & 6 deletions src/openai/_base_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1836,8 +1836,12 @@ def __str__(self) -> str:


def get_platform() -> Platform:
system = platform.system().lower()
platform_name = platform.platform().lower()
try:
system = platform.system().lower()
platform_name = platform.platform().lower()
except Exception:
return "Unknown"

if "iphone" in platform_name or "ipad" in platform_name:
# Tested using Python3IDE on an iPhone 11 and Pythonista on an iPad 7
# system is Darwin and platform_name is a string like:
Expand Down Expand Up @@ -1880,8 +1884,8 @@ def platform_headers(version: str) -> Dict[str, str]:
"X-Stainless-Package-Version": version,
"X-Stainless-OS": str(get_platform()),
"X-Stainless-Arch": str(get_architecture()),
"X-Stainless-Runtime": platform.python_implementation(),
"X-Stainless-Runtime-Version": platform.python_version(),
"X-Stainless-Runtime": get_python_runtime(),
"X-Stainless-Runtime-Version": get_python_version(),
}


Expand All @@ -1897,9 +1901,27 @@ def __str__(self) -> str:
Arch = Union[OtherArch, Literal["x32", "x64", "arm", "arm64", "unknown"]]


def get_python_runtime() -> str:
try:
return platform.python_implementation()
except Exception:
return "unknown"


def get_python_version() -> str:
try:
return platform.python_version()
except Exception:
return "unknown"


def get_architecture() -> Arch:
python_bitness, _ = platform.architecture()
machine = platform.machine().lower()
try:
python_bitness, _ = platform.architecture()
machine = platform.machine().lower()
except Exception:
return "unknown"

if machine in ("arm64", "aarch64"):
return "arm64"

Expand Down