numerapi 2.20.2__tar.gz → 2.20.4__tar.gz

{numerapi-2.20.2 → numerapi-2.20.4}/PKG-INFO

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

{numerapi-2.20.2 → numerapi-2.20.4}/numerapi/base_api.py

@@ -72,7 +72,7 @@ class Api:
                 self.logger.error(msg)
         return msg
 
-    def raw_query(self, query: str, variables: Dict = None,
+    def raw_query(self, query: str, variables: Dict | None = None,
                   authorization: bool = False,
                   *, retries: int = 3, delay: int = 5, backoff: int = 2):
         """Send a raw request to the Numerai's GraphQL API.
@@ -131,7 +131,7 @@ class Api:
             raise ValueError(err)
         return result
 
-    def list_datasets(self, round_num: int = None) -> List[str]:
+    def list_datasets(self, round_num: int | None = None) -> List[str]:
         """List of available data files
 
         Args:
@@ -158,8 +158,8 @@ class Api:
         return self.raw_query(query, args)['data']['listDatasets']
 
     def download_dataset(self, filename: str = None,
-                         dest_path: str = None,
-                         round_num: int = None) -> None:
+                         dest_path: str | None = None,
+                         round_num: int | None = None) -> str:
         """ Download specified file for the given round.
 
         Args:
@@ -358,7 +358,7 @@ class Api:
         }
         return mapping
 
-    def get_current_round(self, tournament: int = None) -> int:
+    def get_current_round(self, tournament: int | None = None) -> int | None:
         """Get number of the current active round.
 
         Args:
@@ -554,9 +554,9 @@ class Api:
             authorization=True)['data'][endpoint]
 
     def upload_diagnostics(self, file_path: str = "predictions.csv",
-                           tournament: int = None,
-                           model_id: str = None,
-                           df: pd.DataFrame = None) -> str:
+                           tournament: int | None = None,
+                           model_id: str | None = None,
+                           df: pd.DataFrame | None = None) -> str:
         """Upload predictions to diagnostics from file.
 
         Args:
@@ -611,7 +611,7 @@ class Api:
         diagnostics_id = create['data']['createDiagnostics']['id']
         return diagnostics_id
 
-    def diagnostics(self, model_id: str, diagnostics_id: str = None) -> Dict:
+    def diagnostics(self, model_id: str, diagnostics_id: str | None = None) -> Dict:
         """Fetch results of diagnostics run
 
         Args:
@@ -935,7 +935,7 @@ class Api:
 
 
     def stake_change(self, nmr, action: str = "decrease",
-                     model_id: str = None) -> Dict:
+                     model_id: str | None = None) -> Dict:
         """Change stake by `value` NMR.
 
         Args:
@@ -1031,7 +1031,7 @@ class Api:
         raw = self.raw_query(query, arguments, authorization=True)
         return raw['data']['releaseStake']
 
-    def stake_decrease(self, nmr, model_id: str = None) -> Dict:
+    def stake_decrease(self, nmr, model_id: str | None = None) -> Dict:
         """Decrease your stake by `value` NMR.
 
         Args:
@@ -1059,7 +1059,7 @@ class Api:
         """
         return self.stake_change(nmr, 'decrease', model_id)
 
-    def stake_increase(self, nmr, model_id: str = None) -> Dict:
+    def stake_increase(self, nmr, model_id: str | None = None) -> Dict:
         """Increase your stake by `value` NMR.
 
         Args:
@@ -1123,12 +1123,11 @@ class Api:
         is_open = open_time < now < deadline
         return is_open
 
-    def check_new_round(self, hours: int = 12, tournament: int = None) -> bool:
+    def check_new_round(self, hours: int = 12) -> bool:
         """Check if a new round has started within the last `hours`.
 
         Args:
             hours (int, optional): timeframe to consider, defaults to 12
-            tournament (int): ID of the tournament (optional)
 
         Returns:
             bool: True if a new round has started, False otherwise.
@@ -1146,8 +1145,7 @@ class Api:
               }
             }
         '''
-        tournament = self.tournament_id if tournament is None else tournament
-        arguments = {'tournament': tournament}
+        arguments = {'tournament': self.tournament_id}
         # in some period in between rounds, "number: 0" returns Value error -
         # "Current round not open for submissions", because there is no active
         # round. This is caught by the try / except.
@@ -1301,10 +1299,10 @@ class Api:
         return res
 
     def model_upload(self, file_path: str,
-                 tournament: int = None,
-                 model_id: str = None,
-                 data_version: str = None,
-                 docker_image: str = None) -> str:
+                 tournament: int | None = None,
+                 model_id: str | None = None,
+                 data_version: str | None = None,
+                 docker_image: str  | None = None) -> str:
         """Upload pickled model to numerai.
 
         Args:
@@ -1471,8 +1469,9 @@ class Api:
         utils.replace(data, "insertedAt", utils.parse_datetime_string)
         return data
 
-    def download_submission(self, submission_id: str = None,
-                            model_id: str = None, dest_path: str = None) -> str:
+    def download_submission(self, submission_id: str | None = None,
+                            model_id: str | None = None,
+                            dest_path: str | None = None) -> str:
         """ Download previous submissions from numerai
 
         Args:
@@ -1516,9 +1515,9 @@ class Api:
         return path
 
     def upload_predictions(self, file_path: str = "predictions.csv",
-                            model_id: str = None,
-                            df: pd.DataFrame = None,
-                            data_datestamp: int = None,
+                            model_id: str | None = None,
+                            df: pd.DataFrame | None = None,
+                            data_datestamp: int | None = None,
                             timeout: Union[None, float, Tuple[float, float]] = (10, 600)
         ) -> str:
         """Upload predictions from file.

{numerapi-2.20.2 → numerapi-2.20.4}/numerapi/signalsapi.py

@@ -80,9 +80,9 @@ class SignalsAPI(base_api.Api):
         return data
 
     def upload_predictions(self, file_path: str = "predictions.csv",
-                           model_id: str = None,
-                           df: pd.DataFrame = None,
-                           data_datestamp: int = None,
+                           model_id: str | None = None,
+                           df: pd.DataFrame | None = None,
+                           data_datestamp: int | None = None,
                            timeout: Union[None, float, Tuple[float, float]] = (10, 600)
     ) -> str:
         """Upload predictions from file.

{numerapi-2.20.2 → numerapi-2.20.4}/numerapi/utils.py

@@ -7,7 +7,6 @@ import time
 import datetime
 import uuid
 import json
-from typing import Optional, Dict
 
 import dateutil.parser
 import requests
@@ -31,14 +30,14 @@ def load_secrets() -> tuple:
     return public_id, secret_key
 
 
-def parse_datetime_string(string: str) -> Optional[datetime.datetime]:
+def parse_datetime_string(string: str) -> datetime.datetime | None:
     """try to parse string to datetime object"""
     if string is None:
         return None
     return dateutil.parser.parse(string)
 
 
-def parse_float_string(string: str) -> Optional[float]:
+def parse_float_string(string: str) -> decimal.Decimal | None:
     """try to parse string to decimal.Decimal object"""
     if string is None:
         return None
@@ -49,7 +48,7 @@ def parse_float_string(string: str) -> Optional[float]:
     return val
 
 
-def replace(dictionary: Dict, key: str, function):
+def replace(dictionary: dict, key: str, function):
     """apply a function to dict item"""
     if dictionary is not None and key in dictionary:
         dictionary[key] = function(dictionary[key])
@@ -105,10 +104,10 @@ def download_file(url: str, dest_path: str, show_progress_bars: bool = True):
     return dest_path
 
 
-def post_with_err_handling(url: str, body: str, headers: Dict,
-                           *, timeout: Optional[int] = None,
+def post_with_err_handling(url: str, body: str, headers: dict,
+                           *, timeout: int | None = None,
                            retries: int = 3, delay: int = 1, backoff: int = 2
-                           ) -> Dict:
+                           ) -> dict:
     """send `post` request and handle (some) errors that might occur"""
     try:
         resp = requests.post(url, json=body, headers=headers, timeout=timeout)

{numerapi-2.20.2 → numerapi-2.20.4}/numerapi.egg-info/PKG-INFO

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

{numerapi-2.20.2 → numerapi-2.20.4}/numerapi.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ numerapi/base_api.py
 numerapi/cli.py
 numerapi/cryptoapi.py
 numerapi/numerapi.py
+numerapi/py.typed
 numerapi/signalsapi.py
 numerapi/utils.py
 numerapi.egg-info/PKG-INFO

{numerapi-2.20.2 → numerapi-2.20.4}/setup.py

@@ -6,7 +6,7 @@ def load(path):
     return open(path, 'r').read()
 
 
-numerapi_version = '2.20.2'
+numerapi_version = '2.20.4'
 
 
 classifiers = [
@@ -33,7 +33,7 @@ if __name__ == "__main__":
         platforms="OS Independent",
         classifiers=classifiers,
         license='MIT License',
-        package_data={'numerai': ['LICENSE', 'README.md', "py.typed"]},
+        package_data={'numerapi': ['LICENSE', 'README.md', "py.typed"]},
         packages=find_packages(exclude=['tests']),
         install_requires=["requests", "pytz", "python-dateutil",
                           "tqdm>=4.29.1", "click>=7.0", "pandas>=1.1.0"],