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
16 changes: 7 additions & 9 deletions src/gpuhunt/providers/vastai.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import logging
import re
from collections import defaultdict
from collections.abc import Iterable
from typing import Any, Literal

import requests
Expand All @@ -25,16 +26,16 @@ def __init__(
self,
extra_filters: dict[str, dict[Operators, FilterValue]] | None = None,
community_cloud: bool = True,
order: Iterable[tuple[str, str]] = [("score", "desc")],
):
self.extra_filters = extra_filters
self.community_cloud = community_cloud
self.order = list(order)

def get(
self, query_filter: QueryFilter | None = None, balance_resources: bool = True
) -> list[RawCatalogItem]:
filters: dict[str, Any] = self.make_filters(
query_filter or QueryFilter(), community_cloud=self.community_cloud
)
filters: dict[str, Any] = self.make_filters(query_filter or QueryFilter())
if self.extra_filters:
for key, constraints in self.extra_filters.items():
for op, value in constraints.items():
Expand Down Expand Up @@ -85,10 +86,7 @@ def get(
instance_offers.append(spot_offer)
return instance_offers

@staticmethod
def make_filters(
q: QueryFilter, community_cloud: bool = True
) -> dict[str, dict[Operators, FilterValue]]:
def make_filters(self, q: QueryFilter) -> dict[str, dict[Operators, FilterValue]]:
filters = defaultdict(dict)
if q.min_cpu is not None:
filters["cpu_cores"]["gte"] = q.min_cpu
Expand Down Expand Up @@ -132,11 +130,11 @@ def make_filters(
# Datacenter offers map to Vast's "server cloud" scope.
# When community_cloud is enabled, keep scope unfiltered so both
# server and community offers are returned.
if not community_cloud:
if not self.community_cloud:
filters["datacenter"]["eq"] = True
filters["rentable"]["eq"] = True
filters["rented"]["eq"] = False
filters["order"] = [["score", "desc"]]
filters["order"] = self.order
return filters

@staticmethod
Expand Down
4 changes: 2 additions & 2 deletions src/tests/providers/test_vastai.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@


def test_make_filters_defaults_to_datacenter_only():
filters = VastAIProvider.make_filters(QueryFilter(), community_cloud=False)
filters = VastAIProvider(community_cloud=False).make_filters(QueryFilter())
assert filters["datacenter"]["eq"] is True
assert "external" not in filters


def test_make_filters_does_not_constrain_scope_when_community_cloud_enabled():
filters = VastAIProvider.make_filters(QueryFilter(), community_cloud=True)
filters = VastAIProvider(community_cloud=True).make_filters(QueryFilter())
assert "datacenter" not in filters
assert "external" not in filters
Loading