Accept matrix generation in start request

API.md

@@ -14,7 +14,7 @@ Returns `{"status":true}` when the application is ready.
 
 `POST /start?p=PASSWORD` queues a matrix run and returns its reserved `Ngr.epng` path. See `send.py` for each request body.
 
-Omitting `type` defaults to `checkpoint`, which runs the existing all-checkpoint matrix. `sampler` compares every sampler in a one-row grid, `scheduler` compares every scheduler in a one-row grid, and `sampler+scheduler` compares every combination. These comparison types resolve the numeric `model_1` and `model_2` prefixes to checkpoint names and use them for the first and second passes. Scheduler comparisons accept `sampler`; an empty value uses DPM++ 2M.
+`generation` is required in `g{N}` form, sets the checkpoint image suffix, and uses `N` as the seed. Omitting `type` defaults to `checkpoint`, which runs the existing all-checkpoint matrix. `sampler` compares every sampler in a one-row grid, `scheduler` compares every scheduler in a one-row grid, and `sampler+scheduler` compares every combination. These comparison types resolve the numeric `model_1` and `model_2` prefixes to checkpoint names and use them for the first and second passes. Scheduler comparisons accept `sampler`; an empty value uses DPM++ 2M.
 
 Each run uses fixed prompts, seeds, dimensions, steps, CFG, upscale settings, and denoise across its cells. The sampler comparison keeps Karras fixed. The scheduler comparison keeps its selected sampler fixed.
 

app.py

@@ -157,8 +157,6 @@ MATRIX_ROW_LABEL_WIDTH = 160
 MATRIX_GRID_SCALE = .25
 MATRIX_GRID_CELL_WIDTH = round(MATRIX_CELL_WIDTH * MATRIX_GRID_SCALE)
 MATRIX_GRID_CELL_HEIGHT = round(MATRIX_CELL_HEIGHT * MATRIX_GRID_SCALE)
-MATRIX_GENERATION = "g2"
-MATRIX_SEED = int(MATRIX_GENERATION[1:])
 MATRIX_TYPES = ("checkpoint", "sampler", "scheduler", "sampler+scheduler")
 GPU_ATTEMPTS = 3
 GPU_RETRY_ERRORS = (
@@ -287,6 +285,7 @@ class DownloadRequest(BaseModel):
 class MatrixRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
+    generation: str = Field(pattern=r"^g\d+$")
     type: str = "checkpoint"
     positive: str
     negative: str
@@ -298,6 +297,7 @@ class MatrixRequest(BaseModel):
 class MatrixCellRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
+    generation: str = Field(pattern=r"^g\d+$")
     positive: str
     negative: str
     folder: str
@@ -652,7 +652,7 @@ def generate_comparison_cell(request, output):
     )[0]
     samples = run_sampler(
         first_model,
-        MATRIX_SEED,
+        int(request.generation[1:]),
         MATRIX_FIRST_STEPS,
         MATRIX_FIRST_CFG,
         request.sampler,
@@ -683,7 +683,7 @@ def generate_comparison_cell(request, output):
     )[0]
     samples = run_sampler(
         second_model,
-        MATRIX_SEED,
+        int(request.generation[1:]),
         MATRIX_SECOND_STEPS,
         MATRIX_SECOND_CFG,
         request.sampler,
@@ -718,7 +718,12 @@ def generate_matrix_cell_core(body):
                 raise ValueError("Invalid matrix output")
             return generate_comparison_cell(request, output)
 
-        diagonal = matrix_image_path(request.folder, first_id, first_id)
+        diagonal = matrix_image_path(
+            request.folder,
+            first_id,
+            first_id,
+            request.generation,
+        )
         if first_id == second_id:
             if diagonal.is_file():
                 return first_id
@@ -738,7 +743,7 @@ def generate_matrix_cell_core(body):
             )[0]
             samples = run_sampler(
                 model,
-                MATRIX_SEED,
+                int(request.generation[1:]),
                 MATRIX_FIRST_STEPS,
                 MATRIX_FIRST_CFG,
                 MATRIX_SAMPLER,
@@ -755,7 +760,12 @@ def generate_matrix_cell_core(body):
             save_named_image(tensor_image(image), diagonal)
             return first_id
 
-        output = matrix_image_path(request.folder, first_id, second_id)
+        output = matrix_image_path(
+            request.folder,
+            first_id,
+            second_id,
+            request.generation,
+        )
         if output.is_file():
             return f"{first_id}-{second_id}"
 
@@ -779,7 +789,7 @@ def generate_matrix_cell_core(body):
         )[0]
         samples = run_sampler(
             model,
-            MATRIX_SEED,
+            int(request.generation[1:]),
             MATRIX_SECOND_STEPS,
             MATRIX_SECOND_CFG,
             MATRIX_SAMPLER,
@@ -1058,16 +1068,16 @@ def comparison_plan(request):
     return first, second, schedulers, samplers
 
 
-def matrix_image_path(folder, first_id, second_id):
+def matrix_image_path(folder, first_id, second_id, generation):
     name = (
-        f"{first_id}{MATRIX_GENERATION}.epng"
+        f"{first_id}{generation}.epng"
         if first_id == second_id
-        else f"{first_id}x{second_id}{MATRIX_GENERATION}.epng"
+        else f"{first_id}x{second_id}{generation}.epng"
     )
     return IMAGE_DIR / folder / name
 
 
-def create_matrix_grid(folder, number, models):
+def create_matrix_grid(folder, number, models, generation):
     count = len(models)
     width = MATRIX_LABEL_SIZE + MATRIX_CELL_WIDTH * count
     height = MATRIX_LABEL_SIZE + MATRIX_CELL_HEIGHT * count
@@ -1094,7 +1104,12 @@ def create_matrix_grid(folder, number, models):
         )
 
         for column, (second_id, _) in enumerate(models):
-            path = matrix_image_path(folder, model_id, second_id)
+            path = matrix_image_path(
+                folder,
+                model_id,
+                second_id,
+                generation,
+            )
             with Image.open(BytesIO(stored_bytes(path))) as source:
                 image = source.convert("RGB")
             cell_x = MATRIX_LABEL_SIZE + column * MATRIX_CELL_WIDTH
@@ -1252,6 +1267,7 @@ def run_checkpoint_matrix(request, folder, number):
     for model in models:
         queued_matrix_cell(
             MatrixCellRequest(
+                generation=request.generation,
                 positive=request.positive,
                 negative=request.negative,
                 folder=folder,
@@ -1265,6 +1281,7 @@ def run_checkpoint_matrix(request, folder, number):
                 continue
             queued_matrix_cell(
                 MatrixCellRequest(
+                    generation=request.generation,
                     positive=request.positive,
                     negative=request.negative,
                     folder=folder,
@@ -1272,7 +1289,7 @@ def run_checkpoint_matrix(request, folder, number):
                     second=second,
                 )
             )
-    create_matrix_grid(folder, number, models)
+    create_matrix_grid(folder, number, models, request.generation)
 
 
 def run_comparison_matrix(request, folder, number):
@@ -1294,6 +1311,7 @@ def run_comparison_matrix(request, folder, number):
             ).name
             queued_matrix_cell(
                 MatrixCellRequest(
+                    generation=request.generation,
                     positive=request.positive,
                     negative=request.negative,
                     folder=folder,

send.py

@@ -5,6 +5,7 @@ import urllib.request
 BASE_URL = "https://q6-c.hf.space"
 PASSWORD = "haip"
 TYPE = "sampler"
+GENERATION = "g2"
 POSITIVE = open('positive.txt', 'r').read()
 NEGATIVE = open('neg.txt', 'r').read()
 SAMPLER = ""
@@ -46,6 +47,7 @@ if TYPE == "sampler+scheduler":
         "negative": NEGATIVE,
     }
 
+body["generation"] = GENERATION
 query = urllib.parse.urlencode({"p": PASSWORD})
 request = urllib.request.Request(
     f"{BASE_URL}/start?{query}",