Merge remote-tracking branch 'upstream/main' into pyronova-v2.3.1

Author: ddxd

.DS_Store

@@ -60,6 +60,28 @@ jobs:
             exit 1
           fi
 
+      # When --save is requested, merge origin/main into the PR branch first.
+      # The bot commits its results back to the PR head; on an old branch the
+      # site/data/*.json files have drifted vs. main and the bot commit
+      # immediately makes the PR CONFLICTING. Merging main here lands the
+      # bench commit on a base that's already in sync, so the PR stays
+      # MERGEABLE. Skipped for non-save runs since they don't push back.
+      - name: Merge main into PR branch
+        if: inputs.save == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git fetch origin main --depth=1
+          if ! git merge --no-edit origin/main; then
+            git merge --abort 2>/dev/null || true
+            gh pr comment "${{ inputs.pr }}" \
+              --repo "${{ github.repository }}" \
+              --body "⚠️ \`/benchmark --save\` aborted: \`main\` has diverged and cannot be auto-merged into this branch. Please merge or rebase \`main\` manually, push, and re-run \`/benchmark --save\`."
+            exit 1
+          fi
+
       - name: Clean previous containers, results, and temp data
         run: |
           docker ps -aq --filter "name=httparena-" | xargs -r docker rm -f 2>/dev/null || true

.claude/scheduled_tasks.lock

@@ -82,6 +82,30 @@ jobs:
           PR_NUMBER: ${{ github.event.issue.number }}
           REPO: ${{ github.repository }}
 
+      # Pre-check that origin/main can auto-merge into the PR. The actual
+      # merge happens inside benchmark-pr.yml after maintainer approval;
+      # doing the dry-run here lets us reject conflicting PRs before
+      # asking a maintainer to approve a run that's guaranteed to abort.
+      # Skipped for non-save runs since they don't push back.
+      - name: Check main merges into PR
+        if: steps.parse.outputs.save == 'true' && steps.parse.outputs.framework != ''
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git fetch origin main --depth=1
+          if ! git merge --no-commit --no-ff origin/main; then
+            git merge --abort 2>/dev/null || true
+            gh pr comment "${{ steps.parse.outputs.pr }}" \
+              --repo "${{ github.repository }}" \
+              --body "⚠️ \`/benchmark --save\` cannot start: \`main\` has diverged and cannot be auto-merged into this branch. Please merge or rebase \`main\` manually, push, and re-run \`/benchmark --save\`."
+            exit 1
+          fi
+          # Discard the merged state — actual merge runs in benchmark-pr.yml
+          # after maintainer approval. main may move between now and then.
+          git merge --abort 2>/dev/null || true
+
       - name: React to comment
         run: |
           gh api "/repos/${{ github.repository }}/issues/comments/${{ github.event.comment.id }}/reactions" -f content="rocket"
@@ -96,8 +120,6 @@ jobs:
             -f framework=${{ steps.parse.outputs.framework }} \
             -f profile="${{ steps.parse.outputs.profile }}" \
             -f save="${{ steps.parse.outputs.save }}"
-
-          gh pr comment "${{ steps.parse.outputs.pr }}" --body "🚀 Benchmark run triggered for \`${{ steps.parse.outputs.framework }}\`${{ steps.parse.outputs.profile && format(' (test: {0})', steps.parse.outputs.profile) || ' (all tests)' }}${{ steps.parse.outputs.save == 'true' && ' with --save' || '' }}. Results will be posted here when done."
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/benchmark-pr.yml

@@ -20,4 +20,7 @@ frameworks/fletch/.dart_tool/
 .vs/
 
 # Ignore node modules anywhere in the repo
-node_modules/
+node_modules/
+
+# macOS Finder metadata
+.DS_Store

.github/workflows/pr-commands.yml

@@ -13,8 +13,4 @@ COPY --from=builder /app/target/aleph-bench-0.1.0-standalone.jar /app/app.jar
 
 EXPOSE 8080
 
-ENTRYPOINT ["java", \
-  "-server", \
-  "-XX:+UseParallelGC", \
-  "-XX:MaxRAMPercentage=50", \
-  "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

.gitignore

@@ -18,7 +18,7 @@
            (io.vertx.core Vertx)
            (io.vertx.pgclient PgBuilder PgConnectOptions)
            (io.vertx.sqlclient PoolOptions)
-           (java.io ByteArrayOutputStream)
+           (java.io ByteArrayOutputStream )
            (java.net URI))
   (:gen-class))
 
@@ -34,7 +34,6 @@
 (def ^:private ^:const dataset-path "/data/dataset.json")
 (def ^:private ^:const dataset-large-path "/data/dataset-large.json")
 (def ^:private ^:const db-path "/data/benchmark.db")
-(def ^:private ^:const static-dir "/data/static")
 (def ^:private ^:const param-min "min")
 (def ^:private ^:const param-max "max")
 (def ^:private ^:const param-limit "limit")
@@ -74,7 +73,9 @@
                           end (if (neg? amp) (.length qs) amp)
                           eq (.indexOf qs (int \=) i)]
                       (if (and (>= eq 0) (< eq end))
-                        (recur (inc end) (+ sum (try (Long/parseLong (subs qs (inc eq) end)) (catch Exception _ 0))))
+                        (recur (inc end)
+                               (+ sum (long (try (Long/parseLong (subs qs (inc eq) end))
+                                                 (catch Exception _ 0)))))
                         (recur (inc end) sum)))))))
 
 (defn- json-response [data]

frameworks/aleph/Dockerfile

@@ -1,7 +1,11 @@
-FROM python:3.13-slim
+FROM python:3.11-slim
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends git build-essential \
+    && rm -rf /var/lib/apt/lists/*
+ENV PATH="/usr/local/bin:$PATH"
 WORKDIR /app
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 COPY . .
-EXPOSE 8080
-CMD [ "python", "./app.py" ]
+EXPOSE 8080 8081
+CMD [ "python", "app.py" ]

frameworks/aleph/src/aleph_bench/core.clj

@@ -127,7 +127,7 @@ def get_header(scope: dict, name: str, def_value: str):
 
 def check_accept_encoding(scope, substr):
     aenc = get_header(scope, 'Accept-Encoding', '')
-    if aenc and substr == "*":
+    if aenc and substr == "":
         return True
     if aenc and substr in aenc:
         return True
@@ -159,35 +159,11 @@ async def baseline11(scope, receive, send):
     req_method = scope.get('method', '')
     query_params = parse_qs(scope.get('query_string', b'').decode())
     total = 0
-    for v in query_params.values():
-        try:
-            total += int(v[0])
-        except ValueError:
-            pass
+    for val in query_params.values():
+        total += int(val[0])
     if req_method == "POST":
-        body = b''
-        while True:
-            message = await receive()
-            body += message.get('body', b'')
-            if not message.get('more_body', False):
-                break
-        if body:
-            try:
-                total += int(body.decode().strip())
-            except UnicodeDecodeError:
-                pass
-            except ValueError:
-                pass
-    return text_resp(str(total))
-
-async def baseline2(scope, receive, send):
-    query_params = parse_qs(scope.get('query_string', b'').decode())
-    total = 0
-    for v in query_params.values():
-        try:
-            total += int(v[0])
-        except ValueError:
-            pass
+        message = await receive()
+        total += int(message.get('body', b''))
     return text_resp(str(total))
 
 async def json_endpoint(scope, receive, send):
@@ -270,7 +246,6 @@ async def upload_endpoint(scope, receive, send):
 ROUTES = {
     '/pipeline': pipeline,
     '/baseline11': baseline11,
-    '/baseline2': baseline2,
     '/json/': json_endpoint,
     '/json-comp/': json_endpoint,
     '/upload': upload_endpoint,
@@ -320,10 +295,15 @@ async def app(scope, receive, send):
 if __name__ == "__main__":
     import fastpysgi
 
-    host = '0.0.0.0'
-    port = 8080
+    certfile = os.environ.get("TLS_CERT", "/certs/server.crt")
+    keyfile  = os.environ.get("TLS_KEY" , "/certs/server.key")
+
+    fastpysgi.server.delete_all_binds()
+    fastpysgi.server.add_bind('0.0.0.0', 8080)
+    fastpysgi.server.add_bind('0.0.0.0', 8081, (certfile, keyfile, None))
 
     fastpysgi.server.read_buffer_size = 256*1024
+    fastpysgi.server.max_content_length = 31_000_000
     fastpysgi.server.backlog = 16*1024
     fastpysgi.server.loop_timeout = 1
-    fastpysgi.run(app, host, port, workers = WRK_COUNT, loglevel = 0)
+    fastpysgi.run(app, workers = WRK_COUNT, loglevel = 0)

frameworks/fastpysgi-asgi/Dockerfile

@@ -8,10 +8,10 @@
   "enabled": true,
   "tests": [
     "baseline",
-    "pipelined",
     "limited-conn",
     "json",
     "json-comp",
+    "json-tls",
     "upload",
     "api-4",
     "api-16",