Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ dependencies = [
"distro>=1.8.0",
"email-validator>=1.1",
"imas-python",
"netCDF4>=1.5",
"numpy>=1.14",
"pydantic>=2.10.6",
"python-dateutil>=2.6",
Expand All @@ -49,7 +50,6 @@ dependencies = [
"semantic-version>=2.8",
"sqlalchemy>=1.2.12,<2.0",
"alembic~=1.13",
"urllib3>=1.26",
"rich>=14.3.3",
]

Expand Down
7 changes: 4 additions & 3 deletions src/simdb/checksum.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import hashlib
from pathlib import Path

from .uri import URI
from simdb.imas.utils import SimDBUrl


def sha1_checksum(uri: URI) -> str:
def sha1_checksum(uri: SimDBUrl) -> str:
"""Generate a SHA1 checksum from the given file.

:param uri: the URI of the file to checksum
Expand All @@ -13,7 +14,7 @@ def sha1_checksum(uri: URI) -> str:
raise ValueError(f"invalid scheme for file checksum: {uri.scheme}")
if uri.path is None:
raise ValueError("Path is not set")
path = uri.path
path = Path(uri.path)

if not path.exists():
raise ValueError("File does not exist")
Expand Down
11 changes: 3 additions & 8 deletions src/simdb/cli/commands/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import click

from simdb.cli.manifest import InvalidManifest, Manifest
from simdb.cli.manifest import Manifest


@click.group()
Expand All @@ -16,13 +16,8 @@ def manifest():
def check(file_name):
"""Check manifest FILE_NAME."""

manifest = Manifest()
manifest.load(file_name)
try:
manifest.validate()
click.echo("ok")
except InvalidManifest as err:
click.echo(err, err=True)
Manifest.load_from_file(file_name)
click.echo("ok")


@manifest.command()
Expand Down
14 changes: 6 additions & 8 deletions src/simdb/cli/commands/simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import click

from simdb.cli.manifest import InvalidAlias, Manifest
from simdb.cli.manifest import Manifest
from simdb.cli.remote_api import RemoteAPI, RemoteError
from simdb.config.config import Config
from simdb.database import DatabaseError, get_local_db
Expand Down Expand Up @@ -148,13 +148,11 @@ def simulation_info(config: Config, sim_id: str):
def simulation_ingest(config: Config, manifest_file: str, alias: str):
"""Ingest a MANIFEST_FILE."""

manifest = Manifest()
manifest.load(Path(manifest_file))
try:
manifest.validate()
except InvalidAlias:
if not alias:
raise
overrides = {}
if alias:
overrides["alias"] = alias

manifest = Manifest.load_from_file(Path(manifest_file), overrides=overrides)

simulation = Simulation(manifest, config)
if alias:
Expand Down
Loading
Loading