Merge branch 'master' into wip/adam

ASSERT-KTH · Nov 6, 2024 · 9f03aa7 · 9f03aa7
2 parents 8fedc4e + a39a548
commit 9f03aa7
Show file tree

Hide file tree

Showing 7 changed files with 1,269 additions and 1,078 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,5 +1,5 @@
 name: lint
-on: [push]
+on: [push, pull_request]
 
 jobs:
   lint:
@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.2.2
 
       - name: Run linter
         uses: psf/black@stable

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,15 +1,15 @@
 name: test
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: jlumbroso/free-disk-space@main
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 
@@ -22,7 +22,7 @@ jobs:
           python -m poetry config virtualenvs.in-project true
     
       - name: Cache the virtualenv
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ./.venv
           key: ${{ runner.os }}-venv-${{ hashFiles('**/poetry.lock') }}
@@ -35,7 +35,7 @@ jobs:
         uses: shogo82148/actions-setup-perl@v1
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '8'

diff --git a/cache b/cache
diff --git a/elleelleaime/export/cost/strategies/anthropic.py b/elleelleaime/export/cost/strategies/anthropic.py
@@ -12,6 +12,10 @@ class AnthropicCostStrategy(CostStrategy):
             "prompt": 3,
             "completion": 15,
         },
+        "claude-3-5-sonnet-20241022": {
+            "prompt": 3,
+            "completion": 15,
+        },
         "claude-3-haiku-20240307": {
             "prompt": 0.25,
             "completion": 1.25,

diff --git a/elleelleaime/export/cost/strategies/openrouter.py b/elleelleaime/export/cost/strategies/openrouter.py
@@ -27,7 +27,7 @@ class OpenRouterCostStrategy(CostStrategy):
         "llama-3.1-nemotron-70b-instruct": {
             "prompt": 0.35,
             "completion": 0.4,
-        }
+        },
     }
 
     @staticmethod

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -32,5 +32,5 @@ google-generativeai = "^0.7.2"
 anthropic = "^0.34.2"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.3.1"
+pytest = "^8.0.0"
 mypy = "^1.2.0"