Merge branch 'master' into load_configs

NicEastvillage · NicEastvillage · commit b0c1b15b17ee · 2025-02-03T14:52:30.000+01:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,61 @@
+name: Upload Python Package
+
+on:
+  push:
+    branches:
+      - master
+
+permissions:
+  contents: read
+
+jobs:
+  release-build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install deps
+        run: python -m pip install wheel build
+
+      - name: Test install
+        run: python -m pip install .
+
+      - name: Build for distribution
+        run: python -m build
+
+      - name: Upload distributions
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+  pypi-publish:
+    runs-on: ubuntu-latest
+    needs:
+      - release-build
+    permissions:
+      # IMPORTANT: this permission is mandatory for trusted publishing
+      id-token: write
+
+    # Dedicated environments with protections for publishing are strongly recommended.
+    # For more information, see: https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#deployment-protection-rules
+    environment:
+      name: pypi
+      url: https://pypi.org/p/rlbot
+
+    steps:
+      - name: Retrieve release distributions
+        uses: actions/download-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+      - name: Publish release distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: dist/
diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@ A high performance Python interface for communicating with RLBot v5.
 
 See this video tutorial on YouTube for a quick start guide: <https://www.youtube.com/watch?v=GLqvodQ942A>
 
+Also see the [main RLBot wiki](https://wiki.rlbot.org/) (make sure to avoid info on v4) and also see [this project's wiki](https://github.com/VirxEC/python-interface/wiki)
+
 ## Dev setup
 
 The following is how to setup a development environment for this project, NOT how to create a bot using this interface!
@@ -23,12 +25,13 @@ The following is how to setup a development environment for this project, NOT ho
   will be reflected in the installed package without
   having to run the command again
 - If you are making changes involving the flatbuffer schema and
-  [rlbot_flatbuffers_py](https://github.com/VirxEC/rlbot_flatbuffers_py), 
+  [rlbot_flatbuffers_py](https://github.com/VirxEC/rlbot_flatbuffers_py),
   also install your local copy of that package in editable mode:
   - `pip uninstall rlbot_flatbuffers`
   - `pip install --editable <path/to/rlbot_flatbuffers>`
 
 This project is formatted using [Black](https://github.com/psf/black).
+
 - Install: `pip install black`.
 - Use: `black .`
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,6 +12,11 @@ dependencies = [
     "psutil==6.*",
 ]
 readme = "README.md"
+license = {text = "Unlicense"}
+authors = [
+    {name = "RLBot Community", email = "rlbotofficial@gmail.com" }
+]
+keywords = ["rocket-league"]
 
 [project.urls]
 Repository = "https://github.com/VirxEC/python-interface"
diff --git a/rlbot/interface.py b/rlbot/interface.py
@@ -1,6 +1,7 @@
 import logging
 import time
 from collections.abc import Callable
+from dataclasses import dataclass
 from enum import IntEnum
 from pathlib import Path
 from socket import IPPROTO_TCP, TCP_NODELAY, socket
@@ -41,10 +42,10 @@ class SocketDataType(IntEnum):
     CONTROLLABLE_TEAM_INFO = 15
 
 
+@dataclass(repr=False, eq=False, frozen=True, match_args=False, slots=True)
 class SocketMessage:
-    def __init__(self, type: int, data: bytes):
-        self.type = SocketDataType(type)
-        self.data = data
+    type: SocketDataType
+    data: bytes
 
 
 class MsgHandlingResult(IntEnum):
@@ -104,9 +105,11 @@ def _read_int(self) -> int:
 
     def _read_exact(self, n: int) -> bytes:
         buff = bytearray(n)
+        view = memoryview(buff)
+
         pos = 0
         while pos < n:
-            cr = self.socket.recv_into(memoryview(buff)[pos:])
+            cr = self.socket.recv_into(view[pos:])
             if cr == 0:
                 raise EOFError
             pos += cr
@@ -116,7 +119,7 @@ def read_message(self) -> SocketMessage:
         type_int = self._read_int()
         size = self._read_int()
         data = self._read_exact(size)
-        return SocketMessage(type_int, data)
+        return SocketMessage(SocketDataType(type_int), data)
 
     def send_bytes(self, data: bytes, data_type: SocketDataType):
         assert self.is_connected, "Connection has not been established"
diff --git a/rlbot/managers/bot.py b/rlbot/managers/bot.py
@@ -250,7 +250,7 @@ def set_game_state(
         balls: dict[int, flat.DesiredBallState] = {},
         cars: dict[int, flat.DesiredCarState] = {},
         match_info: Optional[flat.DesiredMatchInfo] = None,
-        commands: list[flat.ConsoleCommand] = [],
+        commands: list[str] = [],
     ):
         """
         Sets the game to the desired state.
diff --git a/rlbot/managers/hivemind.py b/rlbot/managers/hivemind.py
@@ -170,21 +170,18 @@ def _packet_processor(self, packet: flat.GamePacket):
 
     def _run(self):
         running = True
-        has_more_messages = True
 
         while running:
             # If there might be more messages,
             # check for another one with blocking=False
             # if there are no more messages, process the latest packet
             # then wait for the next message with blocking=True
             match self._game_interface.handle_incoming_messages(
-                blocking=not has_more_messages
+                blocking=self._latest_packet is None
             ):
                 case MsgHandlingResult.TERMINATED:
                     running = False
                 case MsgHandlingResult.NO_INCOMING_MSGS:
-                    has_more_messages = False
-
                     if self._latest_packet is not None:
                         self._packet_processor(self._latest_packet)
                         self._latest_packet = None
@@ -267,7 +264,7 @@ def set_game_state(
         balls: dict[int, flat.DesiredBallState] = {},
         cars: dict[int, flat.DesiredCarState] = {},
         match_info: Optional[flat.DesiredMatchInfo] = None,
-        commands: list[flat.ConsoleCommand] = [],
+        commands: list[str] = [],
     ):
         """
         Sets the game to the desired state.
diff --git a/rlbot/managers/match.py b/rlbot/managers/match.py
@@ -4,7 +4,7 @@
 
 import psutil
 
-from rlbot import flat, version
+from rlbot import flat
 from rlbot.interface import RLBOT_SERVER_IP, RLBOT_SERVER_PORT, SocketRelay
 from rlbot.utils import fill_desired_game_state, gateway
 from rlbot.utils.logging import DEFAULT_LOGGER
@@ -26,17 +26,13 @@ def __init__(
         self,
         main_executable_path: Optional[Path] = None,
         main_executable_name: str = MAIN_EXECUTABLE_NAME,
-        print_version_info: bool = True,
     ):
         self.main_executable_path = main_executable_path
         self.main_executable_name = main_executable_name
 
         self.rlbot_interface: SocketRelay = SocketRelay("")
         self.rlbot_interface.packet_handlers.append(self._packet_reporter)
 
-        if print_version_info:
-            version.print_current_release_notes()
-
     def ensure_server_started(self):
         """
         Ensures that RLBotServer is running, starting it if it is not.
@@ -143,7 +139,7 @@ def set_game_state(
         balls: dict[int, flat.DesiredBallState] = {},
         cars: dict[int, flat.DesiredCarState] = {},
         match_info: Optional[flat.DesiredMatchInfo] = None,
-        commands: list[flat.ConsoleCommand] = [],
+        commands: list[str] = [],
     ):
         """
         Sets the game to the desired state.
diff --git a/rlbot/managers/script.py b/rlbot/managers/script.py
@@ -127,21 +127,18 @@ def _packet_processor(self, packet: flat.GamePacket):
 
     def _run(self):
         running = True
-        has_more_messages = True
 
         while running:
             # If there might be more messages,
             # check for another one with blocking=False
             # if there are no more messages, process the latest packet
             # then wait for the next message with blocking=True
             match self._game_interface.handle_incoming_messages(
-                blocking=not has_more_messages
+                blocking=self._latest_packet is None
             ):
                 case MsgHandlingResult.TERMINATED:
                     running = False
                 case MsgHandlingResult.NO_INCOMING_MSGS:
-                    has_more_messages = False
-
                     if self._latest_packet is not None:
                         self._packet_processor(self._latest_packet)
                         self._latest_packet = None
@@ -220,7 +217,7 @@ def set_game_state(
         balls: dict[int, flat.DesiredBallState] = {},
         cars: dict[int, flat.DesiredCarState] = {},
         match_info: Optional[flat.DesiredMatchInfo] = None,
-        commands: list[flat.ConsoleCommand] = [],
+        commands: list[str] = [],
     ):
         """
         Sets the game to the desired state.
diff --git a/rlbot/utils/__init__.py b/rlbot/utils/__init__.py
@@ -7,14 +7,17 @@ def fill_desired_game_state(
     balls: dict[int, flat.DesiredBallState] = {},
     cars: dict[int, flat.DesiredCarState] = {},
     match_info: Optional[flat.DesiredMatchInfo] = None,
-    commands: list[flat.ConsoleCommand] = [],
+    commands: list[str] = [],
 ) -> flat.DesiredGameState:
     """
-    # Converts the dictionaries to a DesiredGameState by
-    # filling in the blanks with empty states that do nothing.
+    Converts the dictionaries to a DesiredGameState by
+    filling in the blanks with empty states that do nothing.
     """
 
-    game_state = flat.DesiredGameState(match_info=match_info, console_commands=commands)
+    game_state = flat.DesiredGameState(
+        match_info=match_info,
+        console_commands=[flat.ConsoleCommand(cmd) for cmd in commands],
+    )
 
     if balls:
         max_entry = max(balls.keys())
diff --git a/rlbot/utils/logging.py b/rlbot/utils/logging.py
@@ -1,9 +1,23 @@
 import logging
+import os
 import sys
 
 DEFAULT_LOGGER_NAME = "rlbot"
 DEFAULT_LOGGER = None  # Set later
-LOGGING_LEVEL = logging.INFO
+
+match os.environ.get("RLBOT_LOG_LEVEL"):
+    case "debug":
+        LOGGING_LEVEL = logging.DEBUG
+    case "info":
+        LOGGING_LEVEL = logging.INFO
+    case "warn":
+        LOGGING_LEVEL = logging.WARNING
+    case "error":
+        LOGGING_LEVEL = logging.ERROR
+    case "critical":
+        LOGGING_LEVEL = logging.CRITICAL
+    case _:
+        LOGGING_LEVEL = logging.INFO
 
 logging.getLogger().setLevel(logging.NOTSET)
 
diff --git a/rlbot/version.py b/rlbot/version.py
diff --git a/tests/cfg_to_toml.py b/tests/cfg_to_toml.py
diff --git a/tests/default.toml b/tests/default.toml
diff --git a/tests/necto/requirements.txt b/tests/necto/requirements.txt
diff --git a/tests/render_test/render.py b/tests/render_test/render.py
