Skip to content
Open
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
14 changes: 13 additions & 1 deletion api/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ async def s3_client(self):

# Base redis settings.
redis_host: str = Field(
default="172.16.0.100",
default="172.16.0.22",
validation_alias="PRIMARY_REDIS_HOST",
)
redis_port: int = Field(
Expand All @@ -158,6 +158,8 @@ async def s3_client(self):
redis_op_timeout: float = float(
os.getenv("REDIS_OP_TIMEOUT", os.getenv("REDIS_SOCKET_TIMEOUT", "2.5"))
)
redis_fallback_host: Optional[str] = os.getenv("REDIS_FALLBACK_HOST", "172.16.0.23")
redis_primary_probe_interval: float = float(os.getenv("REDIS_PRIMARY_PROBE_INTERVAL", "30.0"))

_redis_client: Optional[redis.Redis] = None
_lite_redis_client: Optional[redis.Redis] = None
Expand All @@ -172,6 +174,12 @@ async def s3_client(self):
def redis_url(self) -> str:
return f"redis://:{self.redis_password}@{self.redis_host}:{self.redis_port}/{self.redis_db}"

def _safe_redis_common_kwargs(self) -> dict:
return dict(
fallback_host=self.redis_fallback_host,
primary_probe_interval=self.redis_primary_probe_interval,
)

@property
def redis_client(self) -> redis.Redis:
if self._redis_client is None:
Expand All @@ -188,6 +196,7 @@ def redis_client(self) -> redis.Redis:
health_check_interval=30,
retry_on_timeout=True,
retry=Retry(ConstantBackoff(0.5), 2),
**self._safe_redis_common_kwargs(),
)
return self._redis_client

Expand All @@ -207,6 +216,7 @@ def lite_redis_client(self) -> redis.Redis:
health_check_interval=30,
retry_on_timeout=True,
retry=Retry(ConstantBackoff(0.5), 2),
**self._safe_redis_common_kwargs(),
)
return self._lite_redis_client

Expand All @@ -226,6 +236,7 @@ def billing_redis_client(self) -> redis.Redis:
health_check_interval=30,
retry_on_timeout=True,
retry=Retry(ConstantBackoff(0.5), 2),
**self._safe_redis_common_kwargs(),
)
return self._billing_redis_client

Expand All @@ -246,6 +257,7 @@ def cm_redis_client(self) -> list[redis.Redis]:
health_check_interval=30,
retry_on_timeout=True,
retry=Retry(ConstantBackoff(0.5), 2),
**self._safe_redis_common_kwargs(),
)
for idx in range(self.cm_redis_shard_count)
]
Expand Down
3 changes: 3 additions & 0 deletions api/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ class NoncePurpose(str, Enum):
# TEE bonus.
TEE_BONUS = 2.25

# Last-instance bonus for public TEE chutes (sole active instance gets this multiplier).
LAST_PUBLIC_TEE_INSTANCE_BONUS = 2.0

# Duration for instance disablement when consecutive errors are hit (increases linearly until max).
INSTANCE_DISABLE_BASE_TIMEOUT = 90

Expand Down
44 changes: 22 additions & 22 deletions api/migrations/20250918104132_per_day_private_instance_rev.sql
Original file line number Diff line number Diff line change
Expand Up @@ -31,68 +31,68 @@ instance_daily_costs AS (
-- Calculate hours for this specific day
CASE
-- Instance runs through the entire day
WHEN DATE(i.activated_at) < d.date
AND DATE(COALESCE(i.stop_billing_at, NOW())) > d.date
WHEN DATE(i.activated_at) < d.date
AND DATE(COALESCE(i.stop_billing_at, NOW())) > d.date
THEN 24.0

-- Instance starts and ends on the same day
WHEN DATE(i.activated_at) = d.date
WHEN DATE(i.activated_at) = d.date
AND DATE(COALESCE(i.stop_billing_at, NOW())) = d.date
THEN EXTRACT(EPOCH FROM (
COALESCE(i.stop_billing_at, NOW()) - i.activated_at
)) / 3600.0

-- Instance starts on this day but continues
WHEN DATE(i.activated_at) = d.date
WHEN DATE(i.activated_at) = d.date
AND DATE(COALESCE(i.stop_billing_at, NOW())) > d.date
THEN EXTRACT(EPOCH FROM (
DATE_TRUNC('day', i.activated_at) + INTERVAL '1 day' - i.activated_at
)) / 3600.0

-- Instance ends on this day
WHEN DATE(i.activated_at) < d.date
WHEN DATE(i.activated_at) < d.date
AND DATE(COALESCE(i.stop_billing_at, NOW())) = d.date
THEN EXTRACT(EPOCH FROM (
COALESCE(i.stop_billing_at, NOW()) - DATE_TRUNC('day', COALESCE(i.stop_billing_at, NOW()))
)) / 3600.0

ELSE 0
END AS hours_on_day,

-- Calculate the revenue for this day
CASE
-- Instance runs through the entire day
WHEN DATE(i.activated_at) < d.date
AND DATE(COALESCE(i.stop_billing_at, NOW())) > d.date
WHEN DATE(i.activated_at) < d.date
AND DATE(COALESCE(i.stop_billing_at, NOW())) > d.date
THEN 24.0 * i.hourly_rate

-- Instance starts and ends on the same day
WHEN DATE(i.activated_at) = d.date
WHEN DATE(i.activated_at) = d.date
AND DATE(COALESCE(i.stop_billing_at, NOW())) = d.date
THEN EXTRACT(EPOCH FROM (
COALESCE(i.stop_billing_at, NOW()) - i.activated_at
)) / 3600.0 * i.hourly_rate

-- Instance starts on this day but continues
WHEN DATE(i.activated_at) = d.date
WHEN DATE(i.activated_at) = d.date
AND DATE(COALESCE(i.stop_billing_at, NOW())) > d.date
THEN EXTRACT(EPOCH FROM (
DATE_TRUNC('day', i.activated_at) + INTERVAL '1 day' - i.activated_at
)) / 3600.0 * i.hourly_rate

-- Instance ends on this day
WHEN DATE(i.activated_at) < d.date
WHEN DATE(i.activated_at) < d.date
AND DATE(COALESCE(i.stop_billing_at, NOW())) = d.date
THEN EXTRACT(EPOCH FROM (
COALESCE(i.stop_billing_at, NOW()) - DATE_TRUNC('day', COALESCE(i.stop_billing_at, NOW()))
)) / 3600.0 * i.hourly_rate

ELSE 0
END AS daily_revenue

FROM date_series d
CROSS JOIN instance_audit i
WHERE
WHERE
-- Only include instances that are billed and not deleted
i.billed_to IS NOT NULL
AND i.deleted_at IS NULL
Expand Down Expand Up @@ -128,7 +128,7 @@ FROM (
sum(case
when quota = 300 then 3
when quota = 2000 then 10
else 20
when quota = 5000 then 20
end) as new_subscriber_revenue
FROM invocation_quotas
WHERE quota > 200
Expand Down
18 changes: 10 additions & 8 deletions api/miner/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,16 @@ async def list_active_instances(
"""
query = text("""
SELECT
instance_id,
miner_hotkey,
chute_id,
activated_at,
COALESCE(compute_multiplier, 1.0) as compute_multiplier
FROM instances
WHERE active = true
AND verified = true
i.instance_id,
i.miner_hotkey,
i.chute_id,
i.activated_at,
COALESCE(ich.compute_multiplier, i.compute_multiplier, 1.0) as compute_multiplier
FROM instances i
LEFT JOIN instance_compute_history ich
ON ich.instance_id = i.instance_id AND ich.ended_at IS NULL
WHERE i.active = true
AND i.verified = true
""")
result = await session.execute(query)
return [
Expand Down
Loading