Merge branch 'alan-turing-institute:develop' into develop

.github/PULL_REQUEST_TEMPLATE/recent_development_template.md

@@ -45,7 +45,7 @@ you can reinstall AIrsenal from our `develop` branch - there are instructions
 
 ### When this PR is ready to merge:
 
-- [ ] **Before merging:** Update the AIrsenal package version in `airsenal/__init__.py`. If new
+- [ ] **Before merging:** Update the AIrsenal package version in `pyproject.toml`. If new
 features have been added increment the middle number, e.g. 0.1.0 -> 0.2.0,
 or if bug fixes only change the last number, e.g. 0.1.0 -> 0.1.1.
 

.github/workflows/docker-ci.yml

@@ -33,4 +33,4 @@ jobs:
           docker run airsenal poetry run pre-commit run --all-files
       - name: Tests
         run: |
-          docker run -e "FPL_TEAM_ID=2779516" airsenal poetry run pytest
+          docker run -e "FPL_TEAM_ID=1822891" airsenal poetry run pytest

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: ["3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v3
@@ -37,5 +37,5 @@ jobs:
           poetry run flake8
       - name: Tests
         env:
-          FPL_TEAM_ID: 2779516
+          FPL_TEAM_ID: 1822891
         run: poetry run pytest

.pre-commit-config.yaml

@@ -16,7 +16,6 @@ repos:
     rev: 23.7.0
     hooks:
     - id: black
-      language_version: python3.9
 -   repo: https://github.com/pycqa/flake8
     rev: 6.1.0
     hooks:

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim-buster
+FROM python:3.11-slim-buster
 
 RUN apt-get update && \
     apt-get install build-essential git sqlite3 curl -y && \

airsenal/conftest.py

@@ -33,7 +33,7 @@
 
 
 @contextmanager
-def test_session_scope():
+def session_scope():
     """Provide a transactional scope around a series of operations."""
     db_session = sessionmaker(bind=testengine_dummy)
     testsession = db_session()
@@ -48,7 +48,7 @@ def test_session_scope():
 
 
 @contextmanager
-def test_past_data_session_scope():
+def past_data_session_scope():
     """Provide a transactional scope around a series of operations."""
     db_session = sessionmaker(bind=testengine_past)
     testsession = db_session()
@@ -85,7 +85,7 @@ def fill_players():
     team_list = list(alternative_team_names.keys())
     season = CURRENT_SEASON
     gameweek = 1
-    with test_session_scope() as ts:
+    with session_scope() as ts:
         if len(ts.query(Player).all()) > 0:
             return
         for i, n in enumerate(dummy_players):

airsenal/framework/schema.py

@@ -5,8 +5,7 @@
 from contextlib import contextmanager
 
 from sqlalchemy import Column, Float, ForeignKey, Integer, String, create_engine
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import relationship, sessionmaker
+from sqlalchemy.orm import declarative_base, relationship, sessionmaker
 
 from airsenal.framework.env import AIRSENAL_HOME, get_env
 

airsenal/framework/transaction_utils.py

@@ -148,11 +148,19 @@ def fill_initial_squad(
         )
     )
     if NEXT_GAMEWEEK == 1:
-        # Season hasn't started yet - there won't be a team in the DB
-        return True
+        print("Season hasn't started yet so nothing to add to the DB.")
+        return
 
     starting_gw = get_entry_start_gameweek(fpl_team_id)
-    print(f"Got starting squad from gameweek {starting_gw}. Adding player data...")
+    print(f"Got starting squad from gameweek {starting_gw}.")
+    if starting_gw == NEXT_GAMEWEEK:
+        print(
+            "This is team {fpl_team_id}'s first gameweek so nothing to add to the DB "
+            "yet."
+        )
+        return
+
+    print("Adding player data...")
 
     init_players = get_players_for_gameweek(starting_gw, fpl_team_id)
     free_hit = free_hit_used_in_gameweek(starting_gw, fpl_team_id)

airsenal/scripts/fill_transfersuggestion_table.py

@@ -55,6 +55,7 @@
 from airsenal.framework.utils import (
     CURRENT_SEASON,
     fetcher,
+    get_entry_start_gameweek,
     get_free_transfers,
     get_gameweeks_array,
     get_latest_prediction_tag,
@@ -425,8 +426,11 @@ def run_optimization(
         fpl_team_id = fetcher.FPL_TEAM_ID
 
     # see if we are at the start of a season, or
-    if gameweeks[0] == 1:
-        print("Starting a new season - will make squad from scratch")
+    if gameweeks[0] == 1 or gameweeks[0] == get_entry_start_gameweek(fpl_team_id):
+        print(
+            "This is the start of the season or a new team - will make a squad "
+            "from scratch"
+        )
         fill_initial_squad(
             tag=tag,
             gw_range=gameweeks,

airsenal/tests/test_api_utils.py

@@ -4,7 +4,7 @@
 
 import re
 
-from airsenal.conftest import API_SESSION_ID, test_session_scope
+from airsenal.conftest import API_SESSION_ID, session_scope
 from airsenal.framework.api_utils import (
     add_session_player,
     get_session_budget,
@@ -19,7 +19,7 @@
 
 
 def test_reset_session_squad():
-    with test_session_scope() as ts:
+    with session_scope() as ts:
         assert reset_session_squad(session_id=API_SESSION_ID, dbsession=ts)
         st = ts.query(SessionSquad).filter_by(session_id=API_SESSION_ID).all()
         assert len(st) == 0
@@ -30,7 +30,7 @@ def test_reset_session_squad():
 
 
 def test_list_all_players(fill_players):
-    with test_session_scope() as ts:
+    with session_scope() as ts:
         player_list = list_players_teams_prices(dbsession=ts, gameweek=1)
         assert isinstance(player_list, list)
         assert len(player_list) > 0
@@ -40,7 +40,7 @@ def test_list_all_players(fill_players):
 
 
 def test_add_player(fill_players):
-    with test_session_scope() as ts:
+    with session_scope() as ts:
         assert reset_session_squad(session_id=API_SESSION_ID, dbsession=ts)
         assert add_session_player(12, API_SESSION_ID, ts)
         players = get_session_players(API_SESSION_ID, ts)
@@ -49,7 +49,7 @@ def test_add_player(fill_players):
 
 
 def test_cant_add_same_player_twice(fill_players):
-    with test_session_scope() as ts:
+    with session_scope() as ts:
         assert reset_session_squad(session_id=API_SESSION_ID, dbsession=ts)
         assert add_session_player(33, API_SESSION_ID, ts)
         assert not add_session_player(33, API_SESSION_ID, ts)
@@ -59,7 +59,7 @@ def test_cant_add_same_player_twice(fill_players):
 
 
 def test_remove_player(fill_players):
-    with test_session_scope() as ts:
+    with session_scope() as ts:
         assert reset_session_squad(session_id=API_SESSION_ID, dbsession=ts)
         assert add_session_player(12, API_SESSION_ID, ts)
         assert remove_session_player(12, API_SESSION_ID, ts)
@@ -68,20 +68,20 @@ def test_remove_player(fill_players):
 
 
 def test_get_budget():
-    with test_session_scope() as ts:
+    with session_scope() as ts:
         assert reset_session_squad(session_id=API_SESSION_ID, dbsession=ts)
         assert get_session_budget(API_SESSION_ID, ts) == 1000
 
 
 def test_set__get_budget():
-    with test_session_scope() as ts:
+    with session_scope() as ts:
         assert reset_session_squad(session_id=API_SESSION_ID, dbsession=ts)
         assert set_session_budget(500, API_SESSION_ID, ts)
         assert get_session_budget(API_SESSION_ID, ts) == 500
 
 
 def test_invalid_session_squad(fill_players):
-    with test_session_scope() as ts:
+    with session_scope() as ts:
         reset_session_squad(session_id=API_SESSION_ID, dbsession=ts)
         assert not validate_session_squad(API_SESSION_ID, ts)
         # add one player - check it is still invalid
@@ -90,7 +90,7 @@ def test_invalid_session_squad(fill_players):
 
 
 def test_valid_session_squad(fill_players):
-    with test_session_scope() as ts:
+    with session_scope() as ts:
         reset_session_squad(API_SESSION_ID, ts)
         for pid in range(15):
             assert add_session_player(pid, API_SESSION_ID, ts)

airsenal/tests/test_optimization.py

@@ -5,6 +5,8 @@
 from operator import itemgetter
 from unittest import mock
 
+import pytest
+
 from airsenal.framework.optimization_transfers import (
     make_optimum_double_transfer,
     make_optimum_single_transfer,
@@ -16,6 +18,8 @@
 )
 from airsenal.framework.squad import Squad
 
+pytestmark = pytest.mark.filterwarnings("ignore:Using purchase price as sale price")
+
 
 class DummyPlayer(object):
     """