From 42be44ff5d085424a31ceb675b0b831f215183d1 Mon Sep 17 00:00:00 2001 From: zer0dss Date: Fri, 10 Jan 2025 17:54:11 +0200 Subject: [PATCH 1/5] update compute_job_cost method --- edsl/results/Results.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/edsl/results/Results.py b/edsl/results/Results.py index 38fb4dc8..5cfce805 100644 --- a/edsl/results/Results.py +++ b/edsl/results/Results.py @@ -170,12 +170,12 @@ def compute_job_cost(self, include_cached_responses_in_cost: bool = False) -> fl """ total_cost = 0 for result in self: - for key in result.raw_model_response: + for key in result["raw_model_response"]: if key.endswith("_cost"): - result_cost = result.raw_model_response[key] + result_cost = result["raw_model_response"][key] question_name = key.removesuffix("_cost") - cache_used = result.cache_used_dict[question_name] + cache_used = result["cache_used_dict"][question_name] if isinstance(result_cost, (int, float)): if include_cached_responses_in_cost: From 7b0d7a987b8f5d028fac44ad23495c315a796206 Mon Sep 17 00:00:00 2001 From: zer0dss Date: Sat, 11 Jan 2025 09:32:26 +0200 Subject: [PATCH 2/5] increae timeout --- edsl/coop/coop.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/edsl/coop/coop.py b/edsl/coop/coop.py index 0bd22d6c..6f8f5e35 100644 --- a/edsl/coop/coop.py +++ b/edsl/coop/coop.py @@ -533,6 +533,7 @@ def remote_cache_create_many( uri="api/v0/remote-cache/many", method="POST", payload=payload, + timeout=40, ) self._resolve_server_response(response) response_json = response.json() @@ -563,6 +564,7 @@ def remote_cache_get( uri="api/v0/remote-cache/get-many", method="POST", payload={"keys": exclude_keys}, + timeout=40, ) self._resolve_server_response(response) return [ From 86cd6947809fe3ec98173333243a9e8518379886 Mon Sep 17 00:00:00 2001 From: zer0dss Date: Sat, 11 Jan 2025 09:33:01 +0200 Subject: [PATCH 3/5] increae timeout --- edsl/coop/coop.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edsl/coop/coop.py b/edsl/coop/coop.py index 6f8f5e35..c9f94101 100644 --- a/edsl/coop/coop.py +++ b/edsl/coop/coop.py @@ -111,13 +111,13 @@ def _send_server_request( url = f"{self.api_url}/{uri}" method = method.upper() if payload is None: - timeout = 20 + timeout = 40 elif ( method.upper() == "POST" and "json_string" in payload and payload.get("json_string") is not None ): - timeout = max(20, (len(payload.get("json_string", "")) // (1024 * 1024))) + timeout = max(40, (len(payload.get("json_string", "")) // (1024 * 1024))) try: if method in ["GET", "DELETE"]: response = requests.request( From 0535cbb12af1ff6bb10ff52f4ee551caa806ea8f Mon Sep 17 00:00:00 2001 From: zer0dss Date: Sat, 11 Jan 2025 19:25:48 +0200 Subject: [PATCH 4/5] no-test. increase timeout for cache-diff endpoint --- edsl/coop/coop.py | 1 + 1 file changed, 1 insertion(+) diff --git a/edsl/coop/coop.py b/edsl/coop/coop.py index c9f94101..911fa63a 100644 --- a/edsl/coop/coop.py +++ b/edsl/coop/coop.py @@ -583,6 +583,7 @@ def remote_cache_get_diff( uri="api/v0/remote-cache/get-diff", method="POST", payload={"keys": client_cacheentry_keys}, + timeout=40, ) self._resolve_server_response(response) response_json = response.json() From 4177e551036b20817090e4bed303307045d0a408 Mon Sep 17 00:00:00 2001 From: zer0dss Date: Sun, 12 Jan 2025 13:32:07 +0000 Subject: [PATCH 5/5] update workflow to run on single job --- .github/workflows/coopr_tests.yml | 34 ++----------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/.github/workflows/coopr_tests.yml b/.github/workflows/coopr_tests.yml index 3dbc6cc7..9f2fddce 100644 --- a/.github/workflows/coopr_tests.yml +++ b/.github/workflows/coopr_tests.yml @@ -7,23 +7,13 @@ on: push: branches: - '**' - workflow_dispatch: jobs: - run-tasks: + build-and-test: if: ${{ github.event_name == 'push' && contains(github.event.head_commit.message, 'coopr') || github.event_name == 'pull_request' }} runs-on: self-hosted - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - build-docker: - if: ${{ github.event_name == 'push' && contains(github.event.head_commit.message, 'coopr') || github.event_name == 'pull_request' }} - runs-on: self-hosted - needs: run-tasks - steps: - name: Checkout repository uses: actions/checkout@v3 @@ -50,31 +40,11 @@ jobs: cd /home/stefan/expectedparrot/coopr docker-compose build --no-cache backend && docker-compose up --wait - run-make-coop-test: - if: ${{ github.event_name == 'push' && contains(github.event.head_commit.message, 'coopr') || github.event_name == 'pull_request' }} - runs-on: self-hosted - needs: build-docker - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Determine last commit hash for EDSL - id: get_edsl_commit - run: | - if [ "${{ github.head_ref }}" != "" ]; then - # Pull Request: Get the last commit from the source branch - echo "EDSL_COMMIT=$(git rev-parse ${{ github.event.pull_request.head.sha }})" >> $GITHUB_ENV - else - # Push: Get the last commit directly - echo "EDSL_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV - fi - - name: Fetch and checkout last commit in EDSL run: | cd /home/stefan/expectedparrot/edsl git fetch origin - git checkout -f $EDSL_COMMIT || git checkout -f origin/main # Fallback to main if commit is unavailable + git checkout -f $COMMIT || git checkout -f origin/main # Fallback to main if commit is unavailable - name: Run make coop-test run: |