Merge pull request #594 from SprocketBot/personal/gankoji/unbork-carball

fix: unbreak the replay-parse build

Author: Jake Bailey

microservices/replay-parse-service/Dockerfile

@@ -1,13 +1,18 @@
-FROM python:3.13 as app_image
+FROM python:3.9 as app_image
 
 WORKDIR /app
 COPY . .
 
 # Install system dependencies, install python packages, then remove system dependencies in a single layer
 # This is necessary to build packages like numpy and pandas from source on the Debian-based slim image
+# Also install Rust/Cargo for sprocket-boxcars-py dependency
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends build-essential python3-dev
+    apt-get install -y --no-install-recommends build-essential python3-dev curl && \
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
+    export PATH="$HOME/.cargo/bin:$PATH" && \
+    apt-get remove -y curl && apt-get autoremove -y
 RUN python3 -m pip install requests
+ENV PATH="/root/.cargo/bin:$PATH"
 RUN python3 -m pip install -r requirements.txt
 
 ENTRYPOINT ["./start.sh"]

microservices/replay-parse-service/requirements.txt

@@ -1,33 +1,26 @@
-amqp==5.3.1
-billiard==4.2.2
-#boxcars-py==0.1.0
-#carball==0.7.5
+# Core dependencies for Celery and message processing
 celery==5.5.3
-certifi==2021.10.8
-charset-normalizer==2.0.12
-click==8.3.0
-click-didyoumean==0.3.0
-click-plugins==1.1.1
-click-repl==0.2.0
-Deprecated==1.2.13
-idna==3.3
 kombu==5.5.4
-minio==7.1.3
-#numpy
-packaging==21.3
-#pandas
-prompt-toolkit==3.0.28
-protobuf==3.6.1
-pyparsing==3.0.7
+amqp==5.3.1
+billiard==4.2.2
+
+# Ballchasing API integration
 python-ballchasing
-python-dateutil==2.8.2
-pytz==2021.3
+
+# Storage and caching
+minio==7.1.3
 redis==4.1.2
+
+# HTTP and API support
 requests==2.27.1
-six==1.16.0
 urllib3==1.26.8
-vine==5.1.0
-wcwidth==0.2.5
-wrapt
-xlrd==1.1.0
-setuptools>=68.0.0
+certifi==2021.10.8
+
+# Utilities
+python-dateutil==2.8.2
+pytz==2021.3
+click==8.1.8
+six==1.16.0
+
+# sprocket-carball for local replay parsing (replaces the old carball package)
+sprocket-carball>=0.8.7

microservices/replay-parse-service/src/parser.py

@@ -1,6 +1,7 @@
 import logging
 from time import sleep
 from typing import Callable
+import carball
 import ballchasing
 from requests import Response
 
@@ -20,17 +21,42 @@
 BACKOFF_FACTOR = config["ballchasing"]["backoffFactor"]
 DELAYS = [0, *(BACKOFF_FACTOR**(r + 1) for r in range(MAX_RETRIES))]
 
-if PARSER != "ballchasing":
-    raise Exception(f"Unknown parser {PARSER}. Only 'ballchasing' is currently supported.")
+if PARSER != "carball" and PARSER != "ballchasing":
+    raise Exception(f"Unknown parser {PARSER}. Please specify either 'carball' or 'ballchasing'.")
 
 
 def parse(path: str, on_progress: Callable[[str], None] = None):
+    if PARSER == "carball":
+        return _parse_carball(path, on_progress)
     if PARSER == "ballchasing":
         return _parse_ballchasing(path, on_progress)
     raise Exception(f"Parser {PARSER} not supported")
 
 
 
+###############################
+#
+# Carball
+#
+###############################
+
+def _parse_carball(path: str, on_progress: Callable[[str], None] = None) -> dict:
+    """
+    Parses a Rocket League replay located at a given local path
+
+    Args:
+        path (str): The local path of the replay file to parse
+
+    Returns:
+        dict: A dictionary containing all of the stats returned by carball
+    """
+    logging.info(f"Parsing {path} with carball")
+
+    analysis_manager = carball.analyze_replay_file(path, logging_level=print)
+    return analysis_manager.get_json_data()
+
+
+
 ###############################
 #
 # Ballchasing