Skip to content

changed null to string #75

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

Open
mguthriem wants to merge 1 commit into
base: next
Choose a base branch
from
Open

changed null to string #75

Show file tree
Hide file tree
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: 10 additions & 4 deletions src/snapwrap/SEEMeta/assembly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,11 @@ class Assembly:
version: ClassVar[int] = 1

components: List[Component] = field(default_factory=list)
comment: Optional[str] = None
model: Optional[str] = None
serialNumber: Optional[str] = None
comment: Optional[str] = "None"
model: Optional[str] = "None"
serialNumber: Optional[str] = "None"
orientation: List[float] = field(default_factory=lambda: [0.0, 1.0, 0.0])
origin: List[float] = field(default_factory=lambda: [0.0, 0.0, 0.0])
stringDescriptor: str = field(init=False)

def __post_init__(self) -> None:
Expand Down Expand Up @@ -226,4 +227,9 @@ def __post_init__(self) -> None:
"CylinderCell: cylinders must be adjoining and concentric; "
f"{i}: innerDiameter ({cur.innerDiameter.value}{cur.innerDiameter.units}) "
f"!= previous outerDiameter ({prev.outerDiameter.value}{prev.outerDiameter.units})"
)
)

@register_assembly
@dataclass(slots=True, kw_only=True)
class empty(Assembly):
kind: ClassVar[str] = "assembly.empty"
14 changes: 7 additions & 7 deletions src/snapwrap/SEEMeta/component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ class Component:
# Schema version for this specific kind
version: ClassVar[int] = 1

manufacturer: Optional[str] = None
model: Optional[str] = None
serialNumber: Optional[str] = None
location: Optional[str] = None
manufacturer: Optional[str] = "None"
model: Optional[str] = "None"
serialNumber: Optional[str] = "None"
location: Optional[str] = "None"
# Optional human-readable description
comment: Optional[str] = None
stlFile: Optional[str] = None
comment: Optional[str] = "None"
stlFile: Optional[str] = "None"

# ---- Serialization ----
def to_dict(self) -> Dict[str, Any]:
Expand Down Expand Up @@ -472,7 +472,7 @@ def __post_init__(self):
# derived descriptor (include model/serial if available)
model = getattr(self, "model", None) or "unknown"
sn = getattr(self, "serialNumber", None)
self.stringDescriptor = f"aux_{model}" + (f"_{sn}" if sn else "")
self.stringDescriptor = f"aux_{self.manufacturer}" + (f"_{sn}" if sn else "")
self.stlFile = f"{self.stringDescriptor}.stl"

@register
Expand Down
Loading