Skip to content
Merged
Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions scripts/test-image-constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def test_constants_exist():
test("FLASH_CPU_IMAGE defined", FLASH_CPU_IMAGE is not None)
test("FLASH_LB_IMAGE defined", FLASH_LB_IMAGE is not None)
test("FLASH_CPU_LB_IMAGE defined", FLASH_CPU_LB_IMAGE is not None)
test("DEFAULT_WORKERS_MIN is 1", DEFAULT_WORKERS_MIN == 1)
test("DEFAULT_WORKERS_MIN is 0", DEFAULT_WORKERS_MIN == 0)
test("DEFAULT_WORKERS_MAX is 1", DEFAULT_WORKERS_MAX == 1)

print(f" Constants values (with FLASH_IMAGE_TAG={FLASH_IMAGE_TAG}):")
Expand All @@ -78,9 +78,9 @@ def test_manifest_builder():

from runpod_flash.cli.commands.build_utils.manifest import ManifestBuilder
from runpod_flash.core.resources.constants import (
FLASH_CPU_LB_IMAGE,
DEFAULT_WORKERS_MIN,
DEFAULT_WORKERS_MAX,
DEFAULT_WORKERS_MIN,
FLASH_CPU_LB_IMAGE,
)

builder = ManifestBuilder(project_name="test", remote_functions=[])
Expand Down
17 changes: 17 additions & 0 deletions src/runpod_flash/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
ServerlessType,
FlashApp,
)
from .core.resources.constants import (
DEFAULT_WORKERS_MAX,
DEFAULT_WORKERS_MIN,
)


def __getattr__(name):
Expand Down Expand Up @@ -109,6 +113,17 @@ def __getattr__(name):
"FlashApp": FlashApp,
}
return attrs[name]
elif name in ("DEFAULT_WORKERS_MIN", "DEFAULT_WORKERS_MAX"):
from .core.resources.constants import (
DEFAULT_WORKERS_MAX,
DEFAULT_WORKERS_MIN,
)

attrs = {
"DEFAULT_WORKERS_MIN": DEFAULT_WORKERS_MIN,
"DEFAULT_WORKERS_MAX": DEFAULT_WORKERS_MAX,
}
return attrs[name]
raise AttributeError(f"module {__name__!r} has no attribute {name!r}")


Expand All @@ -133,4 +148,6 @@ def __getattr__(name):
"ServerlessScalerType",
"ServerlessType",
"FlashApp",
"DEFAULT_WORKERS_MIN",
"DEFAULT_WORKERS_MAX",
]
2 changes: 1 addition & 1 deletion src/runpod_flash/core/resources/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def _endpoint_domain_from_base_url(base_url: str) -> str:
)

# Worker configuration defaults
DEFAULT_WORKERS_MIN = 1
DEFAULT_WORKERS_MIN = 0
DEFAULT_WORKERS_MAX = 1

# Flash app artifact upload constants
Expand Down
6 changes: 3 additions & 3 deletions src/runpod_flash/core/resources/serverless.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from ..utils.backoff import get_backoff_delay
from .base import DeployableResource
from .cloud import runpod
from .constants import CONSOLE_URL
from .constants import CONSOLE_URL, DEFAULT_WORKERS_MAX, DEFAULT_WORKERS_MIN
from .environment import EnvironmentVars
from .cpu import CpuInstanceType
from .gpu import GpuGroup, GpuType
Expand Down Expand Up @@ -166,8 +166,8 @@ class ServerlessResource(DeployableResource):
scalerValue: Optional[int] = 4
templateId: Optional[str] = None
type: Optional[ServerlessType] = ServerlessType.QB
workersMax: Optional[int] = 1
workersMin: Optional[int] = 0
workersMax: Optional[int] = DEFAULT_WORKERS_MAX
workersMin: Optional[int] = DEFAULT_WORKERS_MIN
workersPFBTarget: Optional[int] = 0

# === Runtime Fields ===
Expand Down
Loading