Skip to content

Commit 7ca6d69

Browse files
committed
fix: import cyclical loop
1 parent 7ceddb7 commit 7ca6d69

5 files changed

Lines changed: 21 additions & 13 deletions

File tree

runpod/__init__.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import os
44
import logging
5-
import platform
65

76
from . import serverless
87
from .serverless.modules.rp_logger import RunPodLogger
@@ -36,13 +35,6 @@
3635
endpoint_url_base = "https://api.runpod.ai/v2" # pylint: disable=invalid-name
3736

3837

39-
# ----------------------------- Config User Agent ---------------------------- #
40-
os_info = f"{platform.system()} {platform.release()}; {platform.machine()}"
41-
USER_AGENT = f"RunPod-Python-SDK/{__version__} ({os_info}) Language/Python{platform.python_version()}" # pylint: disable=line-too-long
42-
43-
if os.environ.get('RUNPOD_UA_INTEGRATION') is not None:
44-
USER_AGENT += f" {os.environ.get('RUNPOD_UA_INTEGRATION')}"
45-
4638
# --------------------------- Force Logging Levels --------------------------- #
4739
logging.getLogger("urllib3").setLevel(logging.WARNING)
4840
logging.getLogger("paramiko").setLevel(logging.WARNING)

runpod/api/graphql.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
import requests
99

10-
from runpod import error, USER_AGENT
10+
from runpod import error
11+
from runpod.user_agent import USER_AGENT
1112

1213
HTTP_STATUS_UNAUTHORIZED = 401
1314

runpod/serverless/modules/rp_ping.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
import requests
1010
from urllib3.util.retry import Retry
1111

12+
from runpod.version import __version__ as runpod_version
1213
from runpod.serverless.modules.rp_logger import RunPodLogger
13-
from .worker_state import Jobs, WORKER_ID
14-
from ...version import __version__ as runpod_version
14+
from runpod.serverless.modules.worker_state import Jobs, WORKER_ID
15+
1516

1617
log = RunPodLogger()
17-
jobs = Jobs() # Contains the list of jobs that are currently running.
18+
jobs = Jobs() # Contains the list of jobs that are currently running.
1819

1920

2021
class Heartbeat:

runpod/serverless/worker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import aiohttp
1010

11-
from runpod import USER_AGENT
11+
from runpod.user_agent import USER_AGENT
1212
from runpod.serverless.modules import (
1313
rp_logger, rp_local, rp_handler, rp_ping,
1414
rp_scale

runpod/user_agent.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import os
2+
import platform
3+
4+
from runpod.version import __version__ as runpod_version
5+
6+
os_info = f"{platform.system()} {platform.release()}; {platform.machine()}"
7+
8+
USER_AGENT = f"RunPod-Python-SDK/{runpod_version}"
9+
USER_AGENT += f" ({os_info})"
10+
USER_AGENT += f" Language/Python {platform.python_version()}"
11+
12+
13+
if os.environ.get('RUNPOD_UA_INTEGRATION') is not None:
14+
USER_AGENT += f" Integration/{os.environ.get('RUNPOD_UA_INTEGRATION')}"

0 commit comments

Comments
 (0)