Merge branch 'main' of https://github.com/abundant-ai/oddish

Author: RishiDesai

backend/api/routers/tasks.py

@@ -250,6 +250,7 @@ async def init_task_upload(
         org_id=auth.org_id,
         content_hash=payload.content_hash,
         message=payload.message,
+        force_new_version=payload.force_new_version,
     )
 
 

oddish/pyproject.toml

@@ -7,7 +7,7 @@ name = "oddish"
 version = "0.1.12"
 description = "Run Harbor tasks in the cloud with scheduling, monitoring, and persistent state"
 readme = "README.md"
-requires-python = ">=3.14"
+requires-python = ">=3.13,<3.14"
 license = { file = "LICENSE" }
 authors = [
     { name = "Rishi Desai", email = "rishi@abundant.ai" },

oddish/src/oddish/cli/api.py

@@ -379,6 +379,7 @@ def upload_task(
     message: str | None = None,
     user: str | None = None,
     priority: str | None = None,
+    force_new_version: bool = False,
 ) -> dict:
     """Upload a task directory to the API.
 
@@ -404,6 +405,8 @@ def upload_task(
     }
     if message:
         init_body["message"] = message
+    if force_new_version:
+        init_body["force_new_version"] = True
 
     try:
         with httpx.Client(timeout=600.0, headers=get_auth_headers()) as client:
@@ -481,6 +484,7 @@ def upload_tasks_with_progress(
     quiet: bool = False,
     json_output: bool = False,
     progress_label: str = "Uploading",
+    force_new_version: bool = False,
 ) -> list[dict]:
     """Upload a batch of task directories with a shared progress bar.
 
@@ -501,6 +505,7 @@ def _upload_one(task_path: Path) -> dict:
             message=message,
             user=user,
             priority=priority,
+            force_new_version=force_new_version,
         )
 
     show_progress = not quiet and not json_output

oddish/src/oddish/cli/run.py

@@ -258,6 +258,17 @@ def run(
             help="Force rebuild the environment Docker image",
         ),
     ] = None,
+    force_new_version: Annotated[
+        bool,
+        typer.Option(
+            "--force-new-version",
+            help=(
+                "Allocate a new task version even when the local content is "
+                "unchanged from the latest existing version. Useful when "
+                "appending trials with a different run_analysis setting."
+            ),
+        ),
+    ] = False,
     agent_env: Annotated[
         Optional[list[str]],
         typer.Option(
@@ -531,6 +542,7 @@ def submit_task(
             quiet=quiet,
             json_output=json_output,
             progress_label="Uploading",
+            force_new_version=force_new_version,
         )
         for task_path, result in zip(task_paths, upload_results):
             is_existing = bool(result.get("existing_task", False))

oddish/src/oddish/core/endpoints.py

@@ -1644,11 +1644,16 @@ async def create_task_sweep_core(
         task = await get_task_for_org_core(
             session, task_id=submission.task_id, org_id=org_id
         )
+        # Allow flipping task.run_analysis from False to True on append.
+        # ``run_analysis`` runs at trial-completion time, so updating the
+        # task-level flag does not retroactively analyze pre-existing
+        # trials, but new trials submitted with ``--run-analysis`` will be
+        # analyzed as the caller requested. This matches the documented
+        # purpose of ``--force-new-version`` (see ``TaskUploadInitRequest``)
+        # and lets a task that was first registered without analysis later
+        # opt in without manual intervention.
         if submission.run_analysis and not task.run_analysis:
-            raise HTTPException(
-                status_code=400,
-                detail="Cannot enable run_analysis when appending to a task that was created without it",
-            )
+            task.run_analysis = True
 
         new_experiment_id: str | None = None
         experiment: ExperimentModel | None = None

oddish/src/oddish/core/tasks.py

@@ -73,6 +73,7 @@ async def initialize_task_upload(
     org_id: str | None = None,
     content_hash: str,
     message: str | None = None,
+    force_new_version: bool = False,
 ) -> TaskUploadInitResponse:
     """Prepare a task upload and return direct-upload details when supported."""
     normalized_name = _normalize_task_name(task_name)
@@ -86,7 +87,8 @@ async def initialize_task_upload(
         )
 
         if (
-            latest is not None
+            not force_new_version
+            and latest is not None
             and latest.content_hash
             and latest.content_hash == content_hash
         ):

oddish/src/oddish/schemas.py

@@ -314,6 +314,14 @@ class TaskUploadInitRequest(BaseModel):
     message: str | None = Field(
         None, description="Optional description of what changed in this version"
     )
+    force_new_version: bool = Field(
+        False,
+        description=(
+            "Allocate a new task version even when the content hash matches the "
+            "latest existing version. Used when callers need a fresh version "
+            "stamp (e.g. to flip run_analysis on)."
+        ),
+    )
 
 
 class TaskUploadCompleteRequest(BaseModel):