Skip to content

Commit 4606471

Browse files
committed
Merge branch 'feature/python312' into bug/fix-inappropriate-symbol-and-!-for-factorial
2 parents 10bc2fb + 26b2949 commit 4606471

8 files changed

Lines changed: 436 additions & 6 deletions

File tree

.github/workflows/pre_production_tests.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,21 @@ on:
1212
description: "The maximum number of SQL test cases to run"
1313
required: false
1414
default: 500
15+
seed:
16+
type: string
17+
description: "Random seed for reproducible sampling (float in [-1.0, 1.0]). Leave blank to auto-generate."
18+
required: false
19+
default: ''
20+
request_delay:
21+
type: string
22+
description: "Delay (seconds) between dispatching requests"
23+
required: false
24+
default: '0'
25+
max_concurrency:
26+
type: string
27+
description: "Max concurrent requests (lower for GPT-backed functions)"
28+
required: false
29+
default: '5'
1530

1631
jobs:
1732
run-pre-production-tests:
@@ -20,6 +35,9 @@ jobs:
2035
with:
2136
eval_function: ${{ inputs.eval_function }}
2237
sql_limit: ${{ inputs.sql_limit }}
38+
seed: ${{ inputs.seed }}
39+
request_delay: ${{ inputs.request_delay }}
40+
max_concurrency: ${{ inputs.max_concurrency }}
2341
secrets:
2442
TEST_API_ENDPOINT: ${{ secrets.TEST_API_ENDPOINT }}
2543
DB_USER: ${{ secrets.DB_USER }}

.github/workflows/production-deploy.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,24 @@ on:
1717
required: true
1818
type: string
1919
default: 'main'
20+
seed:
21+
description: 'Random seed for reproducible sampling (float in [-1.0, 1.0]). Leave blank to auto-generate.'
22+
required: false
23+
type: string
24+
default: ''
25+
request_delay:
26+
description: 'Delay (seconds) between dispatching requests'
27+
required: false
28+
type: string
29+
default: '0'
30+
max_concurrency:
31+
description: 'Max concurrent requests (lower for GPT-backed functions)'
32+
required: false
33+
type: string
34+
default: '5'
2035
jobs:
2136
deploy:
22-
uses: lambda-feedback/evaluation-function-workflows/.github/workflows/deploy.yml@deploy-request
37+
uses: lambda-feedback/evaluation-function-workflows/.github/workflows/deploy.yml@main
2338
with:
2439
template-repository-name: 'lambda-feedback/evaluation-function-boilerplate-python'
2540
build-file: "app/Dockerfile"
@@ -28,6 +43,9 @@ jobs:
2843
version-bump: ${{ inputs.version-bump }}
2944
branch: ${{ inputs.branch }}
3045
run-database-tests: true
46+
seed: ${{ inputs.seed }}
47+
request_delay: ${{ inputs.request_delay }}
48+
max_concurrency: ${{ inputs.max_concurrency }}
3149

3250
secrets:
3351
aws-key-id: ${{ secrets.LAMBDA_CONTAINER_PIPELINE_AWS_ID }}

.github/workflows/staging-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
if-no-files-found: warn
6060
deploy:
6161
needs: test
62-
uses: lambda-feedback/evaluation-function-workflows/.github/workflows/deploy.yml@deploy-request
62+
uses: lambda-feedback/evaluation-function-workflows/.github/workflows/deploy.yml@main
6363
with:
6464
template-repository-name: "lambda-feedback/evaluation-function-boilerplate-python"
6565
build-file: "app/Dockerfile"

.github/workflows/test-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ["3.8"]
18+
python-version: ["3.12"]
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v4

app/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
# FROM rabidsheep55/python-base-eval-layer
44
FROM ghcr.io/lambda-feedback/baseevalutionfunctionlayer:main-3.12
55

6-
RUN yum install -y git
6+
RUN dnf install -y git findutils && dnf clean all
77

88
WORKDIR /app
99

10+
ENV PYTHONPATH=/app
11+
1012
# Copy and install any packages/modules needed for your evaluation script.
1113
COPY requirements.txt .
1214
RUN pip3 install -r requirements.txt
@@ -57,4 +59,4 @@ RUN chmod 644 $(find . -type f)
5759
RUN chmod 755 $(find . -type d)
5860

5961
# The entrypoint for AWS is to invoke the handler function within the app package
60-
CMD [ "/app/app.handler" ]
62+
CMD [ "app.handler" ]

app/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pydot
22
typing_extensions
3-
mpmath==1.4.1
3+
mpmath==1.3.0
44
sympy==1.14
55
antlr4-python3-runtime==4.7.2
66
git+https://github.com/lambda-feedback/latex2sympy.git@master#egg=latex2sympy2

0 commit comments

Comments
 (0)