prosperity3bt 0.3.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

prosperity3bt/__main__.py

@@ -6,7 +6,7 @@ from importlib import import_module, metadata, reload
 from pathlib import Path
 from typing import Annotated, Any, Optional
 
-from typer import Argument, Exit, Option, Typer
+from typer import Argument, Option, Typer
 
 from prosperity3bt.data import has_day_data
 from prosperity3bt.file_reader import FileReader, FileSystemReader, PackageResourcesReader
@@ -174,7 +174,7 @@ def format_path(path: Path) -> str:
 def version_callback(value: bool) -> None:
     if value:
         print(f"prosperity3bt {metadata.version(__package__)}")
-        raise Exit()
+        sys.exit(0)
 
 
 app = Typer(context_settings={"help_option_names": ["--help", "-h"]})
@@ -186,11 +186,11 @@ def cli(
     days: Annotated[list[str], Argument(help="The days to backtest on. <round>-<day> for a single day, <round> for all days in a round.", show_default=False)],
     merge_pnl: Annotated[bool, Option("--merge-pnl", help="Merge profit and loss across days.")] = False,
     vis: Annotated[bool, Option("--vis", help="Open backtest results in https://jmerle.github.io/imc-prosperity-3-visualizer/ when done.")] = False,
-    out: Annotated[Optional[Path], Option(help="Path to save output log to (defaults to backtests/<timestamp>.log).", show_default=False, dir_okay=False, resolve_path=True)] = None,
+    out: Annotated[Optional[Path], Option(help="File to save output log to (defaults to backtests/<timestamp>.log).", show_default=False, dir_okay=False, resolve_path=True)] = None,
+    no_out: Annotated[bool, Option("--no-out", help="Skip saving output log.")] = False,
     data: Annotated[Optional[Path], Option(help="Path to data directory. Must look similar in structure to https://github.com/jmerle/imc-prosperity-3-backtester/tree/master/prosperity3bt/resources.", show_default=False, exists=True, file_okay=False, dir_okay=True, resolve_path=True)] = None,
     print_output: Annotated[bool, Option("--print", help="Print the trader's output to stdout while it's running.")] = False,
     match_trades: Annotated[TradeMatchingMode, Option(help="How to match orders against market trades. 'all' matches trades with prices equal to or worse than your quotes, 'worse' matches trades with prices worse than your quotes, 'none' does not match trades against orders at all.")] = TradeMatchingMode.all,
-    no_out: Annotated[bool, Option("--no-out", help="Skip saving the output log to a file.")] = False,
     no_progress: Annotated[bool, Option("--no-progress", help="Don't show progress bars.")] = False,
     original_timestamps: Annotated[bool, Option("--original-timestamps", help="Preserve original timestamps in output log rather than making them increase across days.")] = False,
     version: Annotated[bool, Option("--version", "-v", help="Show the program's version number and exit.", is_eager=True, callback=version_callback)] = False,

prosperity3bt/data.py

@@ -7,6 +7,7 @@ from prosperity3bt.file_reader import FileReader
 LIMITS = {
     "RAINFOREST_RESIN": 50,
     "KELP": 50,
+    "SQUID_INK": 50,
 }
 
 

prosperity3bt/datamodel.py

@@ -13,7 +13,7 @@ ObservationValue = int
 
 
 class Listing:
-    def __init__(self, symbol: Symbol, product: Product, denomination: Product):
+    def __init__(self, symbol: Symbol, product: Product, denomination: int):
         self.symbol = symbol
         self.product = product
         self.denomination = denomination