Merge branch 'master' into master

.flake8

@@ -1,3 +1,4 @@
 [flake8]
-ignore = E501, E203, W503, E402 # line length, space before binary op, line break before binary op, import not at top
+# line length, space before binary op, line break before binary op, import not at top
+ignore = E501, E203, W503, E402
 exclude = .git,__pycache__,build,dist

.github/workflows/osxbuild.yaml

@@ -9,19 +9,19 @@ jobs:
   osx_app:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: 3.9
+
+    - name: Install dependencies
+      run: |
+        brew update
+        brew install libzip
+
     - name: Build KataGo
       run: |
-        export OPENSSL_ROOT_DIR=$(brew --prefix openssl@1.1)
-        export OPENSSL_LIBRARIES="${OPENSSL_ROOT_DIR}/lib"
-        echo $OPENSSL_ROOT_DIR
-        ls $OPENSSL_ROOT_DIR
-        echo $OPENSSL_LIBRARIES
-        ls $OPENSSL_LIBRARIES
         rm katrain/KataGo/katago
         rm katrain/KataGo/*.dll
         rm katrain/KataGo/katago.exe
@@ -37,14 +37,15 @@ jobs:
         unzip "platypus.zip"
         gunzip Platypus.app/Contents/Resources/platypus_clt.gz
         gunzip Platypus.app/Contents/Resources/ScriptExec.gz
-        mkdir -p /usr/local/bin
-        mkdir -p /usr/local/share/platypus
-        cp Platypus.app/Contents/Resources/platypus_clt /usr/local/bin/platypus
-        cp Platypus.app/Contents/Resources/ScriptExec /usr/local/share/platypus/ScriptExec
-        cp -a Platypus.app/Contents/Resources/MainMenu.nib /usr/local/share/platypus/MainMenu.nib
-        chmod -R 755 /usr/local/share/platypus
+        sudo mkdir -p /usr/local/bin
+        sudo mkdir -p /usr/local/share/platypus
+        sudo cp Platypus.app/Contents/Resources/platypus_clt /usr/local/bin/platypus
+        sudo cp Platypus.app/Contents/Resources/ScriptExec /usr/local/share/platypus/ScriptExec
+        sudo cp -a Platypus.app/Contents/Resources/MainMenu.nib /usr/local/share/platypus/MainMenu.nib
+        sudo chmod -R 755 /usr/local/share/platypus
     - name: Get Kivy dependencies
       run: |
+        brew install ninja
         cd ..
         git clone https://github.com/kivy/kivy-sdk-packager.git
         cd kivy-sdk-packager/osx
@@ -54,7 +55,8 @@ jobs:
         pushd ../kivy-sdk-packager/osx/build/KaTrain.app/Contents/Resources/venv/bin
         source activate
         popd
-        python -m pip install .
+        python -m pip install poetry
+        poetry install
     - name: Finalize KaTrain bundle
       run: |
         export KATRAIN_VERSION=`python -c 'from katrain.core.constants import VERSION;print(VERSION)' `
@@ -74,7 +76,7 @@ jobs:
         mkdir osx_app
         cp ../kivy-sdk-packager/osx/KaTrain.dmg osx_app/
     - name: Upload app as artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: KaTrainOSX
         path: osx_app

.github/workflows/release.yaml

@@ -9,31 +9,30 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: 3.12
 
     - name: Install dependencies
       run: |
-        pip3 install -e .
-        pip3 install pytest wheel twine polib
+        pip3 install poetry
+        poetry self add "poetry-dynamic-versioning[plugin]"
+        poetry install --with dev,test
 
     - name: Run tests
-      run: pytest -v -s tests
+      run: poetry run pytest -v -s tests
 
     - name: Run I18N conversion
-      run: python i18n.py
+      run: poetry run python i18n.py
 
     - name: Build
       run: |
-        python3 setup.py sdist
-        python3 setup.py bdist_wheel
+        poetry build
 
     - name: Release to PyPI
       env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USER }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: twine upload --verbose dist/* || echo 'File exists'
+        POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
+      run: poetry publish --verbose

.github/workflows/stale.yml

@@ -0,0 +1,21 @@
+name: "Close stale issues and PRs"
+on:
+  schedule:
+    - cron: "30 1 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      issues: write
+    steps:
+      - uses: actions/stale@v8
+        with:
+          operations-per-run: 200
+          stale-issue-message: "This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 10 days."
+          close-issue-message: "This issue was closed because it has been stalled for 30 days with no activity."
+          days-before-stale: 90
+          days-before-close: 30
+          stale-pr-message: "This PR is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 10 days."
+          close-pr-message: "This PR was closed because it has been stalled for 30 days with no activity."

.github/workflows/test.yaml

@@ -11,28 +11,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.11'] # '3.8', '3.9',
+        python-version: ['3.9', '3.12']  # '3.11',
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Install dependencies
       run: |
-        pip3 install -e .
-        pip3 install pytest wheel polib
+        pip3 install poetry
+        poetry self add "poetry-dynamic-versioning[plugin]"
+        poetry install --with dev,test
 
     - name: Run tests
-      run: pytest tests
+      run: poetry run pytest tests
 
     - name: Run I18N conversion
-      run: python i18n.py -todo
+      run: poetry run python i18n.py -todo
 
     - name: Build
       run: |
-        python3 setup.py sdist
-        python3 setup.py bdist_wheel
+        poetry build

INSTALL.md

@@ -54,7 +54,7 @@ Simply download and run, everything is included.
 ### <a name="WindowsSources"></a>Installation from sources
 
 * Download the repository by clicking the green *Clone or download* on this page and *Download zip*. Extract the contents.
-* Make sure you have a python installation, I will assume Anaconda (Python 3.7/3.8), available [here](https://www.anaconda.com/products/individual#download-section).
+* Make sure you have a python installation, I will assume Anaconda (Python 3.9 or later), available [here](https://www.anaconda.com/products/individual#download-section).
 * Open 'Anaconda prompt' from the start menu and navigate to where you extracted the zip file using the `cd <folder>` command.
 * Execute the command `pip3 install .`
 * Start the app by running `katrain` in the command prompt. 
@@ -63,7 +63,7 @@ Simply download and run, everything is included.
 
 ### <a name="LinuxQuick"></a>Quick install guide
 
-If you have a working Python 3.6-3.8 available, you should be able to simply:
+If you have a working Python 3.9 or later available, you should be able to simply:
 
 * Run `pip3 install -U katrain` to install or upgrade.
 * Run the program by executing `katrain` in a terminal.
@@ -72,15 +72,15 @@ If you have a working Python 3.6-3.8 available, you should be able to simply:
 
 This section describes how to install KaTrain from sources,
  in case you want to run it in a local directory or have more control over the process. 
-It assumes you have a working Python 3.6+ installation.
+It assumes you have a working Python 3.9+ installation.
 
 * Open a terminal.
 * Run the command `git clone https://github.com/sanderland/katrain.git` to download the repository and 
   change directory using `cd katrain`
 * Run the command `pip3 install .` to install the package globally, or use `--user` to install locally.
 * Run the program by typing `katrain` in the terminal.
     * If you prefer not to install, run without installing using `python3 -m katrain` after installing the 
-    dependencies from `requirements.txt`.
+    dependencies from `poetry.lock` with `poetry install`.
 
 A binary for KataGo is included, but if you have compiled your own, press F8 to open general settings and change the 
  KataGo executable path to the relevant KataGo v1.4+ binary.
@@ -101,7 +101,8 @@ sudo apt-get install python3-pip build-essential git python3 python3-dev ffmpeg
 ```
 Then, try installing python package dependencies using:
 ```bash
-pip3 install -r requirements.txt
+pip3 install poetry
+poetry install
 pip3 install screeninfo # Skip on MacOS, not working
 ```
 In case the sound is not working, or there is no available wheel for your OS or Python version, try building kivy locally using:

katrain/KataGo/analysis_config.cfg

@@ -79,6 +79,7 @@ maxVisits = 500
 # But there's no substitute for experimenting and seeing what's best for your hardware and your usage case.
 # Keep in mind that the number of threads you want doesn't necessarily have much to do with how many cores you
 # have on your system, and could easily exceed the number of cores. GPU batching is (usually) the dominant consideration.
+numAnalysisThreads = 12
 numSearchThreads = 8
 
 # nnMaxBatchSize is the max number of positions to send to a single GPU at once. Generally, it should be the case that:

katrain/__main__.py

@@ -1,4 +1,5 @@
 """isort:skip_file"""
+
 # first, logging level lower
 import os
 import sys
@@ -124,6 +125,8 @@ def __init__(self, **kwargs):
         self.contribute_popup = None
 
         self.pondering = False
+        self.show_move_num = False
+
         self.animate_contributing = False
         self.message_queue = Queue()
 
@@ -173,6 +176,10 @@ def toggle_continuous_analysis(self, quiet=False):
             self.pondering = not self.pondering
             self.update_state()
 
+    def toggle_move_num(self):
+        self.show_move_num = not self.show_move_num
+        self.update_state()
+
     def start(self):
         if self.engine:
             return
@@ -740,6 +747,8 @@ def _on_keyboard_down(self, _keyboard, keycode, _text, modifiers):
 
         if keycode[1] == Theme.KEY_TOGGLE_CONTINUOUS_ANALYSIS:
             self.toggle_continuous_analysis(quiet=shift_pressed)
+        elif keycode[1] == Theme.KEY_TOGGLE_MOVENUM:
+            self.toggle_move_num()
         elif keycode[1] == Theme.KEY_TOGGLE_COORDINATES:
             self.board_gui.toggle_coordinates()
         elif keycode[1] in Theme.KEY_PAUSE_TIMER and not ctrl_pressed:

katrain/config.json

@@ -2,9 +2,8 @@
     "engine": {
         "katago": "",
         "altcommand": "",
-        "model": "katrain/models/kata1-b18c384nbt-s6582191360-d3422816034.bin.gz",
+        "model": "katrain/models/kata1-b18c384nbt-s9996604416-d4316597426.bin.gz",
         "config": "katrain/KataGo/analysis_config.cfg",
-        "threads": 12,
         "max_visits": 500,
         "fast_visits": 25,
         "max_time": 8.0,
@@ -28,7 +27,7 @@
         "anim_pv_time": 0.5,
         "debug_level": 0,
         "lang": "en",
-        "version": "1.14.0",
+        "version": "1.15.0",
         "load_fast_analysis": false,
         "load_sgf_rewind": true
     },

katrain/core/ai.py

@@ -142,16 +142,18 @@ def game_report(game, thresholds, depth_filter=None):
         for bw in "BW"
     }
     sum_stats = {
-        bw: {
-            "accuracy": 100 * 0.75 ** wt_loss[bw],
-            "complexity": sum(w for w, aw in weights[bw]) / len(player_ptloss[bw]),
-            "mean_ptloss": sum(player_ptloss[bw]) / len(player_ptloss[bw]),
-            "weighted_ptloss": wt_loss[bw],
-            "ai_top_move": ai_top_move_count[bw] / len(player_ptloss[bw]),
-            "ai_top5_move": ai_approved_move_count[bw] / len(player_ptloss[bw]),
-        }
-        if len(player_ptloss[bw]) > 0
-        else {}
+        bw: (
+            {
+                "accuracy": 100 * 0.75 ** wt_loss[bw],
+                "complexity": sum(w for w, aw in weights[bw]) / len(player_ptloss[bw]),
+                "mean_ptloss": sum(player_ptloss[bw]) / len(player_ptloss[bw]),
+                "weighted_ptloss": wt_loss[bw],
+                "ai_top_move": ai_top_move_count[bw] / len(player_ptloss[bw]),
+                "ai_top5_move": ai_approved_move_count[bw] / len(player_ptloss[bw]),
+            }
+            if len(player_ptloss[bw]) > 0
+            else {}
+        )
         for bw in "BW"
     }
     return sum_stats, histogram, player_ptloss

katrain/core/constants.py

@@ -1,7 +1,7 @@
 PROGRAM_NAME = "KaTrain"
-VERSION = "1.14.0"
+VERSION = "1.15.0"
 HOMEPAGE = "https://github.com/sanderland/katrain"
-CONFIG_MIN_VERSION = "1.14.0"  # keep config files from this version
+CONFIG_MIN_VERSION = "1.15.0"  # keep config files from this version
 ANALYSIS_FORMAT_VERSION = "1.0"
 DATA_FOLDER = "~/.katrain"
 

katrain/core/contribute_engine.py

@@ -72,7 +72,7 @@ def __init__(self, katrain):
         self.max_buffer_games = 2 * settings_dict["maxSimultaneousGames"]
         settings = {f"{k}={v}" for k, v in settings_dict.items()}
         self.command = shlex.split(
-            f'"{exe}" contribute -config "{cfg}" -base-dir "{base_dir}" -override-config "{",".join(settings)}"'
+            f'"{exe}" contribute -config "{cfg}" -base-dir "{base_dir}" -override-config {shlex.quote(",".join(settings))}'
         )
         self.start()
 

katrain/core/engine.py

@@ -128,7 +128,7 @@ def __init__(self, katrain, config):
                 self.on_error(i18n._("Kata config not found").format(config=cfg), code="KATAGO-FILES")
                 return  # don't start
             self.command = shlex.split(
-                f'"{exe}" analysis -model "{model}" -config "{cfg}" -analysis-threads {config["threads"]} -override-config "homeDataDir={os.path.expanduser(DATA_FOLDER)}"'
+                f'"{exe}" analysis -model "{model}" -config "{cfg}" -override-config "homeDataDir={os.path.expanduser(DATA_FOLDER)}"'
             )
         self.start()
 

katrain/core/sgf_parser.py

@@ -577,7 +577,7 @@ def parse_ngf(cls, ngf):
                         key = line[4]
                         raw_move = line[5:7].lower()
                         if raw_move == "aa":
-                            value = "" # pass
+                            value = ""  # pass
                         else:
                             value = chr(ord(raw_move[0]) - 1) + chr(ord(raw_move[1]) - 1)
 

katrain/core/utils.py

@@ -1,15 +1,13 @@
 import heapq
 import math
-import os
+from pathlib import Path
 import random
 import struct
 import sys
 from typing import List, Tuple, TypeVar
 
-try:
-    import importlib.resources as pkg_resources
-except ImportError:
-    import importlib_resources as pkg_resources
+import importlib.resources as pkg_resources
+
 
 T = TypeVar("T")
 
@@ -49,14 +47,13 @@ def find_package_resource(path, silent_errors=False):
     if path.startswith("katrain"):
         if not PATHS.get("PACKAGE"):
             try:
-                with pkg_resources.path("katrain", "gui.kv") as p:
-                    PATHS["PACKAGE"] = os.path.split(str(p))[0]
+                PATHS["PACKAGE"] = str(pkg_resources.files("katrain").absolute())
             except (ModuleNotFoundError, FileNotFoundError, ValueError) as e:
                 print(f"Package path not found, installation possibly broken. Error: {e}", file=sys.stderr)
                 return f"FILENOTFOUND/{path}"
-        return os.path.join(PATHS["PACKAGE"], path.replace("katrain\\", "katrain/").replace("katrain/", ""))
+        return str(Path(PATHS["PACKAGE"]) / path.replace("katrain\\", "katrain/").replace("katrain/", ""))
     else:
-        return os.path.abspath(os.path.expanduser(path))  # absolute path
+        return str(Path(path).expanduser().absolute())
 
 
 def pack_floats(float_list):