numerapi 2.22.0__tar.gz → 2.23.0.dev0__tar.gz

{numerapi-2.22.0 → numerapi-2.23.0.dev0}/PKG-INFO

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

{numerapi-2.22.0 → numerapi-2.23.0.dev0}/numerapi/base_api.py

@@ -383,6 +383,211 @@ class Api:
         }
         return mapping
 
+    def v3_stake_auth(
+        self,
+        submission_id: str,
+        staker: str,
+        amount: float | str | None = None,
+        max_amount: float | str | None = None,
+    ) -> Dict:
+        """Issue a staking v3 authorization for a selected submission.
+
+        Args:
+            submission_id (str): submission id for the selected submission
+            staker (str): staker wallet address
+            amount (float or str, optional): max stake amount for the
+                authorization. Retained as a backwards-compatible alias for
+                `max_amount`.
+            max_amount (float or str, optional): max stake amount for the
+                authorization.
+
+        Returns:
+            dict: authorization payload with the following fields:
+
+                * authorizationSigner (`str`)
+                * authorizationDigest (`str`)
+                * chainId (`str`)
+                * deadline (`str`)
+                * maxAmount (`str`)
+                * amount (`str`) alias for `maxAmount`
+                * modelId (`str`)
+                * nmrAddress (`str`)
+                * nonce (`str`)
+                * roundId (`str`)
+                * signature (`str`)
+                * staker (`str`)
+                * stakingAddress (`str`)
+                * submissionId (`str`)
+                * submissionHash (`str`)
+                * tournamentId (`str`)
+        """
+        if (amount is None) == (max_amount is None):
+            raise ValueError("Provide exactly one of amount or max_amount.")
+
+        max_amount = max_amount if max_amount is not None else amount
+        query = """
+          mutation($submissionId: ID!, $staker: String!, $maxAmount: String!) {
+            v3StakeAuth(
+              submissionId: $submissionId
+              staker: $staker
+              maxAmount: $maxAmount
+            ) {
+              authorizationSigner
+              authorizationDigest
+              chainId
+              deadline
+              maxAmount
+              modelId
+              nmrAddress
+              nonce
+              roundId
+              signature
+              staker
+              stakingAddress
+              submissionId
+              submissionHash
+              tournamentId
+            }
+          }
+        """
+        arguments = {
+            "submissionId": submission_id,
+            "staker": staker,
+            "maxAmount": str(max_amount),
+        }
+        authorization = self.raw_query(query, arguments, authorization=True)["data"][
+            "v3StakeAuth"
+        ]
+        authorization["amount"] = authorization["maxAmount"]
+        return authorization
+
+    def v3_stake_config(self) -> Dict:
+        """Fetch staking v3 contract configuration.
+
+        Returns:
+            dict: staking v3 configuration with the following fields:
+
+                * address (`str`)
+                * authorizationSigner (`str`)
+                * nmrAddress (`str`)
+                * owner (`str`)
+                * paused (`bool`)
+                * pendingOwner (`str`)
+                * serviceWallet (`str`)
+        """
+        query = """
+          query {
+            v3StakeConfig {
+              address
+              authorizationSigner
+              nmrAddress
+              owner
+              paused
+              pendingOwner
+              serviceWallet
+            }
+          }
+        """
+        return self.raw_query(query, authorization=True)["data"]["v3StakeConfig"]
+
+    def v3_stake_round(self, round_id: int | str) -> Dict:
+        """Fetch staking v3 round status by round id.
+
+        Args:
+            round_id (int or str): round id
+
+        Returns:
+            dict: staking v3 round data with the following fields:
+
+                * closeTime (`str`)
+                * merkleRoot (`str`)
+                * openTime (`str`)
+                * payoutFactor (`str`)
+                * remainingBurn (`str`)
+                * remainingPayout (`str`)
+                * resolveTime (`str`)
+                * resolved (`bool`)
+                * roundId (`str`)
+                * stakeCap (`str`)
+                * stakeThreshold (`str`)
+                * state (`str`)
+                * totalPayout (`str`)
+                * totalStaked (`str`)
+                * tournamentId (`str`)
+        """
+        query = """
+          query($roundId: String!) {
+            v3StakeRound(roundId: $roundId) {
+              closeTime
+              merkleRoot
+              openTime
+              payoutFactor
+              remainingBurn
+              remainingPayout
+              resolveTime
+              resolved
+              roundId
+              stakeCap
+              stakeThreshold
+              state
+              totalPayout
+              totalStaked
+              tournamentId
+            }
+          }
+        """
+        arguments = {"roundId": str(round_id)}
+        return self.raw_query(query, arguments, authorization=True)["data"][
+            "v3StakeRound"
+        ]
+
+    def v3_stake_claim(self, round_id: int | str, model_id: str, staker: str) -> Dict:
+        """Fetch a staking v3 claim proof for a model and staker.
+
+        Args:
+            round_id (int or str): round id
+            model_id (str): model id
+            staker (str): staker wallet address
+
+        Returns:
+            dict: claim payload with the following fields:
+
+                * apiModelId (`str`)
+                * burnAmountWei (`str`)
+                * merkleRoot (`str`)
+                * modelId (`str`)
+                * payoutAmountWei (`str`)
+                * proof (`list` of `str`)
+                * roundId (`str`)
+                * staker (`str`)
+                * submissionId (`str`)
+                * tournamentId (`str`)
+        """
+        query = """
+          query($roundId: String!, $modelId: ID!, $staker: String!) {
+            v3StakeClaim(roundId: $roundId, modelId: $modelId, staker: $staker) {
+              apiModelId
+              burnAmountWei
+              merkleRoot
+              modelId
+              payoutAmountWei
+              proof
+              roundId
+              staker
+              submissionId
+              tournamentId
+            }
+          }
+        """
+        arguments = {
+            "roundId": str(round_id),
+            "modelId": model_id,
+            "staker": staker,
+        }
+        return self.raw_query(query, arguments, authorization=True)["data"][
+            "v3StakeClaim"
+        ]
+
     def get_current_round(self, tournament: int | None = None) -> int | None:
         """Get number of the current active round.
 
@@ -1200,7 +1405,7 @@ class Api:
             return False
         if raw is None:
             return False
-        open_time = utils.parse_datetime_string(raw['openTime'])
+        open_time = utils.parse_datetime_string(raw["openTime"])
         now = datetime.datetime.now(tz=pytz.utc)
         is_new_round = open_time > now - datetime.timedelta(hours=hours)
         return is_new_round

{numerapi-2.22.0 → numerapi-2.23.0.dev0}/numerapi.egg-info/PKG-INFO

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

{numerapi-2.22.0 → numerapi-2.23.0.dev0}/setup.py

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

numerapi-2.23.0.dev0/tests/test_base_api.py

@@ -0,0 +1,264 @@
+import json
+import os
+import pytest
+import responses
+
+from numerapi import base_api
+
+
+@pytest.fixture(scope='function', name="api")
+def api_fixture():
+    api = base_api.Api(verbosity='DEBUG')
+    return api
+
+
+def test_NumerAPI():
+    # invalid log level should raise
+    with pytest.raises(AttributeError):
+        base_api.Api(verbosity="FOO")
+
+
+def test__login(api):
+    # passing only one of public_id and secret_key is not enough
+    api._login(public_id="foo", secret_key=None)
+    assert api.token is None
+    api._login(public_id=None, secret_key="bar")
+    assert api.token is None
+    # passing both works
+    api._login(public_id="foo", secret_key="bar")
+    assert api.token == ("foo", "bar")
+
+    # using env variables
+    os.environ["NUMERAI_SECRET_KEY"] = "key"
+    os.environ["NUMERAI_PUBLIC_ID"] = "id"
+    api._login()
+    assert api.token == ("id", "key")
+
+
+def test_raw_query(api):
+    query = "query {latestNmrPrice {priceUsd}}"
+    result = api.raw_query(query)
+    assert isinstance(result, dict)
+    assert "data" in result
+
+
+@responses.activate
+def test_get_account(api):
+    api.token = ("", "")
+    account = {'apiTokens': [{'name': 'uploads',
+                              'public_id': 'AAA',
+                              'scopes': ['upload_submission']},
+                             {'name': '_internal_default',
+                              'public_id': 'BBB',
+                              'scopes': ['upload_submission',
+                                         'read_submission_info',
+                                         'read_user_info']},
+                             {'name': 'all',
+                              'public_id': 'CCC',
+                              'scopes': ['upload_submission',
+                                         'stake',
+                                         'read_submission_info',
+                                         'read_user_info']}],
+               'availableNmr': '1.010000000000000000',
+               'email': 'no-reply@eu83t4nncmxv3g2.xyz',
+               'id': '0c10a70a-a851-478f-a289-7a05fe397008',
+               'insertedAt': "2018-01-01 11:11:11",
+               'mfaEnabled': False,
+               'models': [{'id': '881778ad-2ee9-4fb0-82b4-7b7c0f7ce17d',
+                           'name': 'model1',
+                           'submissions':
+                            [{'filename': 'predictions-pPbLKSHGiR.csv',
+                              'id': 'f2369b69-8c43-47aa-b4de-de3a9de5f52c'}],
+                           'v2Stake': {'status': None, 'txHash': None}},
+                          {'id': '881778ad-2ee9-4fb0-82b4-7b7c0f7ce17d',
+                           'name': 'model2',
+                           'submissions':
+                           [{'filename': 'predictions-pPbPOWQNGiR.csv',
+                             'id': '46a62500-87c7-4d7c-98ad-b743037e8cfd'}],
+                           'v2Stake': {'status': None, 'txHash': None}}],
+               'status': 'VERIFIED',
+               'username': 'username1',
+               'walletAddress': '0x0000000000000000000000000000'}
+
+    data = {'data': {'account': account}}
+    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
+    res = api.get_account()
+    assert isinstance(res, dict)
+    assert len(res.get('models')) == 2
+
+
+@responses.activate
+def test_get_models(api):
+    api.token = ("", "")
+    models_list = [
+        {"name": "model_x", "id": "95b0d9e2-c901-4f2b-9c98-24138b0bd706",
+         "tournament": 0},
+        {"name": "model_y", "id": "2c6d63a4-013f-42d1-bbaf-bf35725d29f7",
+         "tournament": 0}]
+    data = {'data': {'account': {'models': models_list}}}
+    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
+    models = api.get_models()
+    assert sorted(models.keys()) == ['model_x', 'model_y']
+    assert sorted(models.values()) == ['2c6d63a4-013f-42d1-bbaf-bf35725d29f7',
+                                       '95b0d9e2-c901-4f2b-9c98-24138b0bd706']
+
+
+@responses.activate
+def test_set_submission_webhook(api):
+    api.token = ("", "")
+    data = {
+      "data": {
+        "setSubmissionWebhook": "true"
+      }
+    }
+    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
+    res = api.set_submission_webhook(
+        '2c6d63a4-013f-42d1-bbaf-bf35725d29f7',
+        'https://triggerurl'
+    )
+    assert res
+
+
+@responses.activate
+def test_v3_stake_auth(api):
+    api.token = ("", "")
+    data = {"data": {"v3StakeAuth": {
+        "authorizationSigner": "0xsigner",
+        "authorizationDigest": "0xdigest",
+        "chainId": "11155111",
+        "deadline": "1770000000",
+        "maxAmount": "25",
+        "modelId": "0xmodel",
+        "nmrAddress": "0xnmr",
+        "nonce": "0",
+        "roundId": "4321",
+        "signature": "0x1234",
+        "staker": "0xstaker",
+        "stakingAddress": "0xstaking",
+        "submissionId": "submission-id",
+        "submissionHash": "0xhash",
+        "tournamentId": "8",
+    }}}
+    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
+
+    result = api.v3_stake_auth("submission-id", "0xstaker", amount=25)
+
+    body = json.loads(responses.calls[0].request.body)
+    assert "v3StakeAuth" in body["query"]
+    assert body["variables"]["submissionId"] == "submission-id"
+    assert body["variables"]["maxAmount"] == "25"
+    assert "maxAmount" in body["query"]
+    assert result["maxAmount"] == "25"
+    assert result["amount"] == "25"
+    assert result["authorizationDigest"] == "0xdigest"
+
+
+@responses.activate
+def test_v3_stake_auth_accepts_max_amount(api):
+    api.token = ("", "")
+    data = {"data": {"v3StakeAuth": {
+        "authorizationSigner": "0xsigner",
+        "authorizationDigest": "0xdigest",
+        "chainId": "11155111",
+        "deadline": "1770000000",
+        "maxAmount": "30",
+        "modelId": "0xmodel",
+        "nmrAddress": "0xnmr",
+        "nonce": "0",
+        "roundId": "4321",
+        "signature": "0x1234",
+        "staker": "0xstaker",
+        "stakingAddress": "0xstaking",
+        "submissionId": "submission-id",
+        "submissionHash": "0xhash",
+        "tournamentId": "8",
+    }}}
+    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
+
+    result = api.v3_stake_auth(
+        "submission-id",
+        "0xstaker",
+        max_amount="30",
+    )
+
+    body = json.loads(responses.calls[0].request.body)
+    assert body["variables"]["maxAmount"] == "30"
+    assert result["maxAmount"] == "30"
+    assert result["amount"] == "30"
+
+
+@responses.activate
+def test_v3_stake_config(api):
+    api.token = ("", "")
+    data = {"data": {"v3StakeConfig": {
+        "address": "0xstaking",
+        "authorizationSigner": "0xsigner",
+        "nmrAddress": "0xnmr",
+        "owner": "0xowner",
+        "paused": False,
+        "pendingOwner": "0xpending",
+        "serviceWallet": "0xservice",
+    }}}
+    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
+
+    result = api.v3_stake_config()
+
+    body = json.loads(responses.calls[0].request.body)
+    assert "v3StakeConfig" in body["query"]
+    assert result["authorizationSigner"] == "0xsigner"
+
+
+@responses.activate
+def test_v3_stake_round(api):
+    api.token = ("", "")
+    data = {"data": {"v3StakeRound": {
+        "closeTime": "1",
+        "merkleRoot": "0xroot",
+        "openTime": "0",
+        "payoutFactor": "0.5",
+        "remainingBurn": "0",
+        "remainingPayout": "2",
+        "resolveTime": "2",
+        "resolved": False,
+        "roundId": "4321",
+        "stakeCap": "100",
+        "stakeThreshold": "10",
+        "state": "open",
+        "totalPayout": "2",
+        "totalStaked": "50",
+        "tournamentId": "8",
+    }}}
+    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
+
+    result = api.v3_stake_round(4321)
+
+    body = json.loads(responses.calls[0].request.body)
+    assert "v3StakeRound" in body["query"]
+    assert body["variables"]["roundId"] == "4321"
+    assert result["roundId"] == "4321"
+
+
+@responses.activate
+def test_v3_stake_claim(api):
+    api.token = ("", "")
+    data = {"data": {"v3StakeClaim": {
+        "apiModelId": "api-model-id",
+        "burnAmountWei": "0",
+        "merkleRoot": "0xroot",
+        "modelId": "0xmodel",
+        "payoutAmountWei": "2000000000000000000",
+        "proof": ["0xproof"],
+        "roundId": "4321",
+        "staker": "0xstaker",
+        "submissionId": "submission-id",
+        "tournamentId": "8",
+    }}}
+    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
+
+    result = api.v3_stake_claim(4321, "api-model-id", "0xstaker")
+
+    body = json.loads(responses.calls[0].request.body)
+    assert "v3StakeClaim" in body["query"]
+    assert body["variables"]["roundId"] == "4321"
+    assert body["variables"]["modelId"] == "api-model-id"
+    assert result["proof"] == ["0xproof"]

{numerapi-2.22.0 → numerapi-2.23.0.dev0}/tests/test_numerapi.py

@@ -1,5 +1,6 @@
 import pytest
 import datetime
+import json
 import pytz
 import responses
 
@@ -99,3 +100,4 @@ def test_check_new_round(api):
     assert api.check_new_round()
     # second
     assert not api.check_new_round()
+

numerapi-2.22.0/tests/test_base_api.py

@@ -1,118 +0,0 @@
-import os
-import pytest
-import responses
-
-from numerapi import base_api
-
-
-@pytest.fixture(scope='function', name="api")
-def api_fixture():
-    api = base_api.Api(verbosity='DEBUG')
-    return api
-
-
-def test_NumerAPI():
-    # invalid log level should raise
-    with pytest.raises(AttributeError):
-        base_api.Api(verbosity="FOO")
-
-
-def test__login(api):
-    # passing only one of public_id and secret_key is not enough
-    api._login(public_id="foo", secret_key=None)
-    assert api.token is None
-    api._login(public_id=None, secret_key="bar")
-    assert api.token is None
-    # passing both works
-    api._login(public_id="foo", secret_key="bar")
-    assert api.token == ("foo", "bar")
-
-    # using env variables
-    os.environ["NUMERAI_SECRET_KEY"] = "key"
-    os.environ["NUMERAI_PUBLIC_ID"] = "id"
-    api._login()
-    assert api.token == ("id", "key")
-
-
-def test_raw_query(api):
-    query = "query {latestNmrPrice {priceUsd}}"
-    result = api.raw_query(query)
-    assert isinstance(result, dict)
-    assert "data" in result
-
-
-@responses.activate
-def test_get_account(api):
-    api.token = ("", "")
-    account = {'apiTokens': [{'name': 'uploads',
-                              'public_id': 'AAA',
-                              'scopes': ['upload_submission']},
-                             {'name': '_internal_default',
-                              'public_id': 'BBB',
-                              'scopes': ['upload_submission',
-                                         'read_submission_info',
-                                         'read_user_info']},
-                             {'name': 'all',
-                              'public_id': 'CCC',
-                              'scopes': ['upload_submission',
-                                         'stake',
-                                         'read_submission_info',
-                                         'read_user_info']}],
-               'availableNmr': '1.010000000000000000',
-               'email': 'no-reply@eu83t4nncmxv3g2.xyz',
-               'id': '0c10a70a-a851-478f-a289-7a05fe397008',
-               'insertedAt': "2018-01-01 11:11:11",
-               'mfaEnabled': False,
-               'models': [{'id': '881778ad-2ee9-4fb0-82b4-7b7c0f7ce17d',
-                           'name': 'model1',
-                           'submissions':
-                            [{'filename': 'predictions-pPbLKSHGiR.csv',
-                              'id': 'f2369b69-8c43-47aa-b4de-de3a9de5f52c'}],
-                           'v2Stake': {'status': None, 'txHash': None}},
-                          {'id': '881778ad-2ee9-4fb0-82b4-7b7c0f7ce17d',
-                           'name': 'model2',
-                           'submissions':
-                           [{'filename': 'predictions-pPbPOWQNGiR.csv',
-                             'id': '46a62500-87c7-4d7c-98ad-b743037e8cfd'}],
-                           'v2Stake': {'status': None, 'txHash': None}}],
-               'status': 'VERIFIED',
-               'username': 'username1',
-               'walletAddress': '0x0000000000000000000000000000'}
-
-    data = {'data': {'account': account}}
-    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
-    res = api.get_account()
-    assert isinstance(res, dict)
-    assert len(res.get('models')) == 2
-
-
-@responses.activate
-def test_get_models(api):
-    api.token = ("", "")
-    models_list = [
-        {"name": "model_x", "id": "95b0d9e2-c901-4f2b-9c98-24138b0bd706",
-         "tournament": 0},
-        {"name": "model_y", "id": "2c6d63a4-013f-42d1-bbaf-bf35725d29f7",
-         "tournament": 0}]
-    data = {'data': {'account': {'models': models_list}}}
-    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
-    models = api.get_models()
-    assert sorted(models.keys()) == ['model_x', 'model_y']
-    assert sorted(models.values()) == ['2c6d63a4-013f-42d1-bbaf-bf35725d29f7',
-                                       '95b0d9e2-c901-4f2b-9c98-24138b0bd706']
-
-
-@responses.activate
-def test_set_submission_webhook(api):
-    api.token = ("", "")
-    data = {
-      "data": {
-        "setSubmissionWebhook": "true"
-      }
-    }
-    responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
-    res = api.set_submission_webhook(
-        '2c6d63a4-013f-42d1-bbaf-bf35725d29f7',
-        'https://triggerurl'
-    )
-    assert res