Skip to content

Make model id optional for PySBModel #318

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
dweindl merged 1 commit into from
Nov 8, 2024
Merged

Make model id optional for PySBModel #318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions petab/v1/models/pysb_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import pysb

from .. import is_valid_identifier
from . import MODEL_TYPE_PYSB
from .model import Model

Expand Down Expand Up @@ -53,14 +54,21 @@ class PySBModel(Model):

type_id = MODEL_TYPE_PYSB

def __init__(self, model: pysb.Model, model_id: str):
def __init__(self, model: pysb.Model, model_id: str = None):
super().__init__()

self.model = model
self._model_id = model_id
self._model_id = model_id or self.model.name

if not is_valid_identifier(self._model_id):
raise ValueError(
f"Model ID '{self._model_id}' is not a valid identifier. "
"Either provide a valid identifier or change the model name "
"to a valid PEtab model identifier."
)

@staticmethod
def from_file(filepath_or_buffer, model_id: str):
def from_file(filepath_or_buffer, model_id: str = None):
return PySBModel(
model=_pysb_model_from_path(filepath_or_buffer), model_id=model_id
)
Expand Down