numerapi 2.23.0.dev2__tar.gz → 2.23.1__tar.gz

{numerapi-2.23.0.dev2 → numerapi-2.23.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numerapi
-Version: 2.23.0.dev2
+Version: 2.23.1
 Summary: Automatically download and upload data for the Numerai machine learning competition
 Home-page: https://github.com/uuazed/numerapi
 Maintainer: uuazed

{numerapi-2.23.0.dev2 → numerapi-2.23.1}/numerapi/__init__.py

@@ -3,9 +3,9 @@
 from importlib.metadata import version, PackageNotFoundError
 
 try:
-    __version__ = version("package-name")
+    __version__ = version("numerapi")
 except PackageNotFoundError:
-    __version__ = 'unknown'
+    __version__ = "unknown"
 
 
 # pylint: disable=wrong-import-position

{numerapi-2.23.0.dev2 → numerapi-2.23.1}/numerapi/base_api.py

@@ -620,6 +620,79 @@ class Api:
         round_num = data["number"]
         return round_num
 
+    def list_rounds(
+        self,
+        number: int | None = None,
+        target: str | None = None,
+        status: str | None = None,
+        limit: int | None = None,
+    ) -> List[Dict]:
+        """List rounds with the filters supported by the round resolver.
+
+        Args:
+            number (int, optional): round number filter
+            target (str, optional): round target filter
+            status (str, optional): round status filter. One of `upcoming`,
+                `open`, `resolving`, or `resolved`
+            limit (int, optional): maximum number of rounds to return
+
+        Returns:
+            list of dicts: round entries matching the provided filters
+        """
+        query = """
+            query($tournament: Int
+                  $number: Int
+                  $target: String
+                  $status: RoundStatus
+                  $limit: Int) {
+              rounds(tournament: $tournament
+                     number: $number
+                     target: $target
+                     status: $status
+                     limit: $limit) {
+                id
+                tournament
+                number
+                target
+                closeTime
+                closeStakingTime
+                openTime
+                scoreTime
+                resolveTime
+                resolvedGeneral
+                resolvedStaking
+                payoutFactor
+                stakeThreshold
+                minCorrMultiplier
+                maxCorrMultiplier
+                defaultCorrMultiplier
+                minMmcMultiplier
+                maxMmcMultiplier
+                defaultMmcMultiplier
+                dataDatestamp
+              }
+            }
+        """
+        arguments = {
+            "tournament": self.tournament_id,
+            "number": number,
+            "target": target,
+            "status": None if status is None else status.upper(),
+            "limit": limit,
+        }
+        rounds = self.raw_query(query, arguments)["data"]["rounds"]
+        for round_info in rounds:
+            for field in [
+                "closeTime",
+                "closeStakingTime",
+                "openTime",
+                "scoreTime",
+                "resolveTime",
+            ]:
+                utils.replace(round_info, field, utils.parse_datetime_string)
+            utils.replace(round_info, "payoutFactor", utils.parse_float_string)
+        return rounds
+
     def set_bio(self, model_id: str, bio: str) -> bool:
         """Set bio field for a model id.
 
@@ -1054,7 +1127,6 @@ class Api:
         version: str | None = None,
         day: int | None = None,
         resolved: bool | None = None,
-        tournament: int | None = None,
         last_n_rounds: int | None = None,
         distinct_on_round: bool | None = None,
     ) -> List[Dict]:
@@ -1116,7 +1188,7 @@ class Api:
             "version": version,
             "day": day,
             "resolved": resolved,
-            "tournament": self.tournament_id if tournament is None else tournament,
+            "tournament": self.tournament_id,
             "lastNRounds": last_n_rounds,
             "distinctOnRound": distinct_on_round,
         }

{numerapi-2.23.0.dev2 → numerapi-2.23.1}/numerapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numerapi
-Version: 2.23.0.dev2
+Version: 2.23.1
 Summary: Automatically download and upload data for the Numerai machine learning competition
 Home-page: https://github.com/uuazed/numerapi
 Maintainer: uuazed

{numerapi-2.23.0.dev2 → numerapi-2.23.1}/numerapi.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ numerapi.egg-info/requires.txt
 numerapi.egg-info/top_level.txt
 tests/test_base_api.py
 tests/test_cli.py
+tests/test_cryptoapi.py
 tests/test_numerapi.py
 tests/test_signalsapi.py
 tests/test_utils.py

{numerapi-2.23.0.dev2 → numerapi-2.23.1}/setup.py

@@ -5,7 +5,7 @@ def load(path):
     return open(path, "r").read()
 
 
-numerapi_version = "2.23.0.dev2"
+numerapi_version = "2.23.1"
 
 
 classifiers = [

{numerapi-2.23.0.dev2 → numerapi-2.23.1}/tests/test_base_api.py

@@ -178,6 +178,69 @@ def test_submission_scores(api):
     assert request_body["variables"]["distinctOnRound"] is True
 
 
+@responses.activate
+def test_list_rounds(api):
+    api.tournament_id = 11
+    data = {
+        "data": {
+            "rounds": [
+                {
+                    "id": "round-1",
+                    "tournament": 11,
+                    "number": 123,
+                    "target": "main",
+                    "closeTime": "2026-03-27T00:00:00Z",
+                    "closeStakingTime": "2026-03-26T12:00:00Z",
+                    "openTime": "2026-03-20T00:00:00Z",
+                    "scoreTime": "2026-03-29T00:00:00Z",
+                    "resolveTime": "2026-04-01T00:00:00Z",
+                    "resolvedGeneral": False,
+                    "resolvedStaking": False,
+                    "payoutFactor": "0.8",
+                    "stakeThreshold": 0.1,
+                    "minCorrMultiplier": 0.0,
+                    "maxCorrMultiplier": 1.0,
+                    "defaultCorrMultiplier": 0.5,
+                    "minMmcMultiplier": 0.0,
+                    "maxMmcMultiplier": 1.0,
+                    "defaultMmcMultiplier": 0.5,
+                    "dataDatestamp": 20260320,
+                }
+            ]
+        }
+    }
+    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
+
+    res = api.list_rounds(number=123, target="main", status="open", limit=5)
+
+    assert len(res) == 1
+    assert isinstance(res[0]["closeTime"], datetime.datetime)
+    assert isinstance(res[0]["closeStakingTime"], datetime.datetime)
+    assert isinstance(res[0]["openTime"], datetime.datetime)
+    assert isinstance(res[0]["scoreTime"], datetime.datetime)
+    assert isinstance(res[0]["resolveTime"], datetime.datetime)
+    assert isinstance(res[0]["payoutFactor"], decimal.Decimal)
+
+    request_body = json.loads(responses.calls[0].request.body)
+    assert request_body["variables"]["tournament"] == 11
+    assert request_body["variables"]["number"] == 123
+    assert request_body["variables"]["target"] == "main"
+    assert request_body["variables"]["status"] == "OPEN"
+    assert request_body["variables"]["limit"] == 5
+
+
+@responses.activate
+def test_list_rounds_uses_api_tournament_id_by_default(api):
+    api.tournament_id = 11
+    data = {"data": {"rounds": []}}
+    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
+
+    api.list_rounds()
+
+    request_body = json.loads(responses.calls[0].request.body)
+    assert request_body["variables"]["tournament"] == 11
+
+
 @responses.activate
 def test_pending_model_payouts(api):
     api.token = ("", "")

{numerapi-2.23.0.dev2 → numerapi-2.23.1}/tests/test_cli.py

@@ -1,8 +1,11 @@
+import importlib
+import importlib.metadata
 import os
 import pytest
 from click.testing import CliRunner
 from unittest.mock import patch
 
+import numerapi
 from numerapi import cli
 
 
@@ -117,3 +120,19 @@ def test_version():
     result = CliRunner().invoke(cli.version)
     # just testing if calling works fine
     assert result.exit_code == 0
+
+
+def test_version_uses_numerapi_distribution_name(monkeypatch):
+    called_package_names = []
+
+    def mock_version(package_name):
+        called_package_names.append(package_name)
+        return "2.23.1"
+
+    with monkeypatch.context() as context:
+        context.setattr(importlib.metadata, "version", mock_version)
+        importlib.reload(numerapi)
+        assert called_package_names == ["numerapi"]
+        assert numerapi.__version__ == "2.23.1"
+
+    importlib.reload(numerapi)

numerapi-2.23.1/tests/test_cryptoapi.py

@@ -0,0 +1,43 @@
+import decimal
+from unittest.mock import patch
+
+import pytest
+
+import numerapi
+
+
+@pytest.fixture(scope="function", name="api")
+def api_fixture():
+    api = numerapi.CryptoAPI(verbosity="DEBUG")
+    return api
+
+
+@patch("numerapi.cryptoapi.CryptoAPI.raw_query")
+def test_get_leaderboard(mocked, api):
+    mocked.return_value = {
+        "data": {
+            "cryptosignalsLeaderboard": [
+                {
+                    "nmrStaked": "13.0",
+                    "rank": 1,
+                    "username": "crypto_user",
+                    "corrRep": 0.1,
+                    "mmcRep": 0.2,
+                    "return_1_day": 0.03,
+                    "return_52_weeks": 0.4,
+                    "return_13_weeks": 0.15,
+                }
+            ]
+        }
+    }
+
+    lb = api.get_leaderboard(1)
+
+    assert len(lb) == 1
+    assert lb[0]["username"] == "crypto_user"
+    assert lb[0]["nmrStaked"] == decimal.Decimal("13.0")
+    mocked.assert_called_once()
+    args, kwargs = mocked.call_args
+    assert "cryptosignalsLeaderboard" in args[0]
+    assert args[1] == {"limit": 1, "offset": 0}
+    assert kwargs == {}