Skip to content

Remove platform from watchdog model #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bruno-f-cruz merged 3 commits into from
Dec 1, 2025
Merged

Remove platform from watchdog model #210

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fd83cf
Remove platform from watchdog
bruno-f-cruz Nov 24, 2025
2cb9104
Add watchdog package as a dependency to not have to maintain model du…
bruno-f-cruz Dec 1, 2025
9d2cba3
Use pypi as source for watchdog package
bruno-f-cruz Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/clabe/data_transfer/_aind_watchdog_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

Path: TypeAlias = Annotated[Union[pathlib.Path, str], AfterValidator(lambda v: pathlib.Path(v).as_posix())]

Platform: TypeAlias = str
Modality: TypeAlias = str
BucketType: TypeAlias = Literal["private", "open", "default"]
DEFAULT_TRANSFER_ENDPOINT: str = "http://aind-data-transfer-service-dev/api/v2/submit_jobs"
Expand Down Expand Up @@ -56,7 +55,6 @@ class ManifestConfig(BaseModel, extra="ignore"):
description="Transfer endpoint for data transfer",
title="Transfer endpoint",
)
platform: Platform = Field(description="Platform type", title="Platform type")
capsule_id: Optional[str] = Field(default=None, description="Capsule ID of pipeline to run", title="Capsule")
mount: Optional[str] = Field(default=None, description="Mount point for pipeline run", title="Mount point")
s3_bucket: BucketType = Field(default="private", description="s3 endpoint", title="S3 endpoint")
Expand Down Expand Up @@ -98,13 +96,14 @@ def validate_capsule(self) -> Self:
raise ValueError("Both capsule and mount must be provided, or must both be None")
return self

@model_validator(mode="after") # TODO remove this once SciComp allows it...
@model_validator(mode="after")
def set_name(self) -> Self:
"""Construct name"""
if self.name is None:
label = self.subject_id
self.name = build_data_name(
f"{self.platform}_{self.subject_id}",
self.acquisition_datetime,
label=str(label),
creation_datetime=self.acquisition_datetime,
)
return self

Expand Down
5 changes: 1 addition & 4 deletions src/clabe/data_transfer/aind_watchdog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import subprocess
from os import PathLike
from pathlib import Path, PurePosixPath
from typing import Callable, ClassVar, Dict, List, Literal, Optional, Union
from typing import Callable, ClassVar, Dict, List, Optional, Union

import aind_data_transfer_service.models.core
import pydantic
Expand Down Expand Up @@ -55,7 +55,6 @@ class WatchdogSettings(ServiceSettings):
default=None, description="Additional modality data to include in the transfer"
)
mount: Optional[None] = pydantic.Field(default=None, deprecated=True)
platform: Literal["behavior"] = pydantic.Field(default="behavior", deprecated=True)
capsule_id: Optional[None] = pydantic.Field(default=None, deprecated=True)
script: Optional[Dict[str, List[str]]] = pydantic.Field(default=None, deprecated=True)

Expand Down Expand Up @@ -267,7 +266,6 @@ def _create_manifest_from_session(self, session: AindBehaviorSessionModel) -> Ma
processor_full_name=",".join(session.experimenter),
project_name=self._settings.project_name,
schedule_time=self._settings.schedule_time,
platform=self._settings.platform,
capsule_id=self._settings.capsule_id,
s3_bucket=self._settings.s3_bucket,
script=self._settings.script if self._settings.script else {},
Expand Down Expand Up @@ -352,7 +350,6 @@ def _make_transfer_args(
upload_job_configs_v2 = aind_data_transfer_service.models.core.UploadJobConfigsV2(
job_type=job_type,
project_name=manifest.project_name,
platform=aind_data_transfer_service.models.core.Platform.from_abbreviation(manifest.platform),
modalities=[
aind_data_transfer_service.models.core.Modality.from_abbreviation(m) for m in manifest.modalities.keys()
],
Expand Down