From 1d6830d769fa3f8547316fca1cc32aab50259497 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Tue, 26 Mar 2024 13:55:44 -0400
Subject: [PATCH 01/15] Added initial_weight and empty_weight to spool

---
 client/src/pages/spools/create.tsx            | 42 +++++++++++++++++
 client/src/pages/spools/edit.tsx              | 46 +++++++++++++++++++
 ...4_03_26_0948-aafcd7fb0e84_spool_weights.py | 30 ++++++++++++
 ...49-304a32906234_spool_weight_population.py | 46 +++++++++++++++++++
 spoolman/api/v1/spool.py                      | 12 +++++
 spoolman/database/models.py                   |  2 +
 spoolman/database/spool.py                    | 36 ++++++++++++---
 7 files changed, 207 insertions(+), 7 deletions(-)
 create mode 100644 migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py
 create mode 100644 migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py

diff --git a/client/src/pages/spools/create.tsx b/client/src/pages/spools/create.tsx
index 5381897..deeaf4e 100644
--- a/client/src/pages/spools/create.tsx
+++ b/client/src/pages/spools/create.tsx
@@ -107,6 +107,9 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
   });
   filamentOptions?.sort((a, b) => a.label.localeCompare(b.label, undefined, { sensitivity: "base" }));
 
+  const [defaultEmptySpoolWeight, setDefaultEmptySpoolWeight] = useState(0);
+  const [defaultInitialTotalWeight, setDefaultInitialTotalWeight] = useState(0);
+
   const [weightToEnter, setWeightToEnter] = useState(1);
   const [usedWeight, setUsedWeight] = useState(0);
 
@@ -124,6 +127,9 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
     const newFilamentWeight = newSelectedFilament?.weight || 0;
     const newSpoolWeight = newSelectedFilament?.spool_weight || 0;
 
+    setDefaultEmptySpoolWeight(newSpoolWeight);
+    setDefaultInitialTotalWeight(newFilamentWeight + newSpoolWeight);
+
     if (weightToEnter >= 3) {
       if (!(newFilamentWeight && newSpoolWeight)) {
         setWeightToEnter(2);
@@ -254,6 +260,42 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             parser={numberParser}
           />
         </Form.Item>
+        <Form.Item
+          label={t("spool.fields.initial_weight")}
+          help={t("spool.fields_help.initial_weight")}
+          name={["initial_weight"]}
+          rules={[
+            {
+              required: false,
+              type: "number",
+              min: 0,
+            },
+          ]}
+        >
+          <InputNumber 
+            addonAfter="g"
+            precision={1}
+            defaultValue={defaultInitialTotalWeight} />
+        </Form.Item>
+
+        <Form.Item
+          label={t("spool.fields.empty_weight")}
+          help={t("spool.fields_help.empty_weight")}
+          name={["empty_weight"]}
+          rules={[
+            {
+              required: false,
+              type: "number",
+              min: 0,
+            },
+          ]}
+        >
+          <InputNumber 
+            addonAfter="g" 
+            precision={1}
+            defaultValue={defaultEmptySpoolWeight} />
+        </Form.Item>
+
         <Form.Item hidden={true} name={["used_weight"]} initialValue={0}>
           <InputNumber value={usedWeight} />
         </Form.Item>
diff --git a/client/src/pages/spools/edit.tsx b/client/src/pages/spools/edit.tsx
index a592dfc..35b335b 100644
--- a/client/src/pages/spools/edit.tsx
+++ b/client/src/pages/spools/edit.tsx
@@ -56,6 +56,9 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
     formProps.initialValues = ParsedExtras(formProps.initialValues);
   }
 
+  const [defaultEmptySpoolWeight, setDefaultEmptySpoolWeight] = useState(0);
+  const [defaultInitialTotalWeight, setDefaultInitialTotalWeight] = useState(0);
+
   // Override the form's onFinish method to stringify the extra fields
   const originalOnFinish = formProps.onFinish;
   formProps.onFinish = (allValues: ISpoolParsedExtras) => {
@@ -107,6 +110,13 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
     const newSelectedFilament = filamentOptions?.find((obj) => {
       return obj.value === newID;
     });
+
+    const newFilamentWeight = newSelectedFilament?.weight || 0;
+    const newSpoolWeight = newSelectedFilament?.spool_weight || 0;
+
+    setDefaultEmptySpoolWeight(newSpoolWeight);
+    setDefaultInitialTotalWeight(newFilamentWeight + newSpoolWeight);
+
     const filamentHasWeight = newSelectedFilament?.weight || 0;
     const filamentHasSpoolWeight = newSelectedFilament?.spool_weight || 0;
 
@@ -238,6 +248,42 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
             parser={numberParser}
           />
         </Form.Item>
+        <Form.Item
+          label={t("spool.fields.initial_weight")}
+          help={t("spool.fields_help.initial_weight")}
+          name={["initial_weight"]}
+          rules={[
+            {
+              required: false,
+              type: "number",
+              min: 0,
+            },
+          ]}
+        >
+          <InputNumber 
+            addonAfter="g"
+            precision={1}
+            defaultValue={defaultInitialTotalWeight} />
+        </Form.Item>
+
+        <Form.Item
+          label={t("spool.fields.empty_weight")}
+          help={t("spool.fields_help.empty_weight")}
+          name={["empty_weight"]}
+          rules={[
+            {
+              required: false,
+              type: "number",
+              min: 0,
+            },
+          ]}
+        >
+          <InputNumber 
+            addonAfter="g" 
+            precision={1}
+            defaultValue={defaultEmptySpoolWeight} />
+        </Form.Item>
+
         <Form.Item hidden={true} name={["used_weight"]} initialValue={0}>
           <InputNumber value={usedWeight} />
         </Form.Item>
diff --git a/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py b/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py
new file mode 100644
index 0000000..0d834be
--- /dev/null
+++ b/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py
@@ -0,0 +1,30 @@
+"""spool weights.
+
+Revision ID: aafcd7fb0e84
+Revises: b8881bdb716c
+Create Date: 2024-03-26 09:48:09.930022
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = 'aafcd7fb0e84'
+down_revision = 'b8881bdb716c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """Perform the upgrade."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('spool', sa.Column('initial_weight', sa.Float(), nullable=True, comment="The initial total weight of the spool (gross weight)."))
+    op.add_column('spool', sa.Column('empty_weight', sa.Float(), nullable=True, comment="The weight of the empty spool (tare weight)."))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Perform the downgrade."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('spool', 'empty_weight')
+    op.drop_column('spool', 'initial_weight')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py b/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
new file mode 100644
index 0000000..73861be
--- /dev/null
+++ b/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
@@ -0,0 +1,46 @@
+"""spool weight population.
+
+Revision ID: 304a32906234
+Revises: aafcd7fb0e84
+Create Date: 2024-03-26 13:49:26.594399
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = '304a32906234'
+down_revision = 'aafcd7fb0e84'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    filament = sa.Table('filament',
+        sa.MetaData(),
+        sa.Column('id', sa.Integer, primary_key=True),
+        sa.Column('weight', sa.Float(), nullable=True),
+        sa.Column('spool_weight', sa.Float(), nullable=True))
+    
+    spool = sa.Table(
+        'spool',
+        sa.MetaData(),
+        sa.Column('id', sa.Integer, primary_key=True),
+        sa.Column('filament_id', sa.Integer),
+        sa.Column('initial_weight', sa.Float(), nullable=False, comment="The initial total weight of the spool (gross weight)."),
+        sa.Column('empty_weight', sa.Float(), nullable=False, comment="The weight of the empty spool (tare weight).")
+    ) 
+    
+    initial_weight = sa.select((filament.c.weight + filament.c.spool_weight).label("initial_weight")).where(filament.c.id == spool.c.filament_id).scalar_subquery()
+    empty_weight = sa.select(filament.c.spool_weight).where(filament.c.id == spool.c.filament_id).scalar_subquery()
+
+    set_initial_weight = sa.update(spool).values(initial_weight=initial_weight)
+    op.execute(set_initial_weight)
+
+    set_empty_weight = sa.update(spool).values(empty_weight=empty_weight)
+    op.execute(set_empty_weight)
+    pass
+
+
+def downgrade() -> None:
+    """Perform the downgrade."""
+    pass
diff --git a/spoolman/api/v1/spool.py b/spoolman/api/v1/spool.py
index 1391dfd..e701fca 100644
--- a/spoolman/api/v1/spool.py
+++ b/spoolman/api/v1/spool.py
@@ -40,6 +40,16 @@ class SpoolParameters(BaseModel):
         description="The price of this filament in the system configured currency.",
         example=20.0,
     )
+    initial_weight: Optional[float] = Field(
+        ge=0,
+        description="The initial total weight of the spool.",
+        example=200,
+    )
+    empty_weight: Optional[float] = Field(
+        ge=0,
+        description="The weight of an empty spool.",
+        example=200,
+    )
     remaining_weight: Optional[float] = Field(
         ge=0,
         description=(
@@ -354,6 +364,8 @@ async def create(  # noqa: ANN201
             db=db,
             filament_id=body.filament_id,
             price=body.price,
+            initial_weight=body.initial_weight,
+            empty_weight=body.empty_weight,
             remaining_weight=body.remaining_weight,
             used_weight=body.used_weight,
             first_used=body.first_used,
diff --git a/spoolman/database/models.py b/spoolman/database/models.py
index f06ac6f..b009bdf 100644
--- a/spoolman/database/models.py
+++ b/spoolman/database/models.py
@@ -64,6 +64,8 @@ class Spool(Base):
     price: Mapped[Optional[float]] = mapped_column()
     filament_id: Mapped[int] = mapped_column(ForeignKey("filament.id"))
     filament: Mapped["Filament"] = relationship(back_populates="spools")
+    initial_weight: Mapped[float] = mapped_column()
+    empty_weight: Mapped[float] = mapped_column()
     used_weight: Mapped[float] = mapped_column()
     location: Mapped[Optional[str]] = mapped_column(String(64))
     lot_nr: Mapped[Optional[str]] = mapped_column(String(64))
diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index dfbaad8..ca384d8 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -35,6 +35,8 @@ async def create(
     db: AsyncSession,
     filament_id: int,
     remaining_weight: Optional[float] = None,
+    initial_weight: Optional[float] = None,
+    empty_weight: Optional[float] = None,
     used_weight: Optional[float] = None,
     first_used: Optional[datetime] = None,
     last_used: Optional[datetime] = None,
@@ -47,11 +49,19 @@ async def create(
 ) -> models.Spool:
     """Add a new spool to the database. Leave weight empty to assume full spool."""
     filament_item = await filament.get_by_id(db, filament_id)
+
+    if empty_weight is None:
+        empty_weight = filament_item.spool_weight if filament_item.spool_weight is not None else 0
+
+    # Calculate initial_weight if not provided
+    if initial_weight is None:
+        initial_weight = (filament_item.weight if filament_item.weight is not None else 0) + empty_weight
+
     if used_weight is None:
         if remaining_weight is not None:
-            if filament_item.weight is None:
-                raise ItemCreateError("remaining_weight can only be used if the filament type has a weight set.")
-            used_weight = max(filament_item.weight - remaining_weight, 0)
+            if initial_weight is None or initial_weight == 0:
+                raise ItemCreateError("remaining_weight can only be used if the initial_weight is defined.")
+            used_weight = max(initial_weight - empty_weight - remaining_weight, 0)
         else:
             used_weight = 0
 
@@ -64,6 +74,8 @@ async def create(
     spool = models.Spool(
         filament=filament_item,
         registered=datetime.utcnow().replace(microsecond=0),
+        initial_weight=initial_weight,
+        empty_weight=empty_weight,
         used_weight=used_weight,
         price=price,
         first_used=first_used,
@@ -150,7 +162,7 @@ async def find(
         for fieldstr, order in sort_by.items():
             sorts = []
             if fieldstr in {"remaining_weight", "remaining_length"}:
-                sorts.append(models.Filament.weight - models.Spool.used_weight)
+                sorts.append(models.Spool.initial_weight - models.Spool.empty_weight - models.Spool.used_weight)
             elif fieldstr == "filament.combined_name":
                 sorts.append(models.Vendor.name)
                 sorts.append(models.Filament.name)
@@ -181,10 +193,20 @@ async def update(
     for k, v in data.items():
         if k == "filament_id":
             spool.filament = await filament.get_by_id(db, v)
+            # If there is no initial_weight, calculate it from the filament weight
+            if (
+                spool.initial_weight is None
+                and spool.empty_weight is None
+                and spool.filament.weight is not None
+            ):
+                spool_weight = (spool.empty_weight if spool.empty_weight is not None else 0)
+                spool.initial_weight = spool.filament.weight + spool_weight
+                spool.empty_weight = spool_weight
+
         elif k == "remaining_weight":
-            if spool.filament.weight is None:
-                raise ItemCreateError("remaining_weight can only be used if the filament type has a weight set.")
-            spool.used_weight = max(spool.filament.weight - v, 0)
+            if spool.initial_weight is None:
+                raise ItemCreateError("remaining_weight can only be used if initial_weight is set.")
+            spool.used_weight = max((spool.initial_weight - spool.empty_weight) - v, 0)
         elif isinstance(v, datetime):
             setattr(spool, k, utc_timezone_naive(v))
         elif k == "extra":

From 83fd3073ec700b480974d68d15831a7bf905e753 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Tue, 26 Mar 2024 14:02:17 -0400
Subject: [PATCH 02/15] Fixed formatting

---
 ...4_03_26_0948-aafcd7fb0e84_spool_weights.py | 23 ++++++---
 ...49-304a32906234_spool_weight_population.py | 48 ++++++++++++-------
 spoolman/database/spool.py                    |  8 +---
 3 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py b/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py
index 0d834be..ec14929 100644
--- a/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py
+++ b/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py
@@ -8,8 +8,8 @@ import sqlalchemy as sa
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = 'aafcd7fb0e84'
-down_revision = 'b8881bdb716c'
+revision = "aafcd7fb0e84"
+down_revision = "b8881bdb716c"
 branch_labels = None
 depends_on = None
 
@@ -17,14 +17,25 @@ depends_on = None
 def upgrade() -> None:
     """Perform the upgrade."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('spool', sa.Column('initial_weight', sa.Float(), nullable=True, comment="The initial total weight of the spool (gross weight)."))
-    op.add_column('spool', sa.Column('empty_weight', sa.Float(), nullable=True, comment="The weight of the empty spool (tare weight)."))
+    op.add_column(
+        "spool",
+        sa.Column(
+            "initial_weight",
+            sa.Float(),
+            nullable=True,
+            comment="The initial total weight of the spool (gross weight).",
+        ),
+    )
+    op.add_column(
+        "spool",
+        sa.Column("empty_weight", sa.Float(), nullable=True, comment="The weight of the empty spool (tare weight)."),
+    )
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     """Perform the downgrade."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('spool', 'empty_weight')
-    op.drop_column('spool', 'initial_weight')
+    op.drop_column("spool", "empty_weight")
+    op.drop_column("spool", "initial_weight")
     # ### end Alembic commands ###
diff --git a/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py b/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
index 73861be..fc30c42 100644
--- a/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
+++ b/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
@@ -8,29 +8,46 @@ import sqlalchemy as sa
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = '304a32906234'
-down_revision = 'aafcd7fb0e84'
+revision = "304a32906234"
+down_revision = "aafcd7fb0e84"
 branch_labels = None
 depends_on = None
 
 
 def upgrade() -> None:
-    filament = sa.Table('filament',
+    """Pre-populate the spool weights."""
+    """This must be done in a separate migration because"""
+    """of cockroachdb's execution of alembic migrations"""
+    filament = sa.Table(
+        "filament",
         sa.MetaData(),
-        sa.Column('id', sa.Integer, primary_key=True),
-        sa.Column('weight', sa.Float(), nullable=True),
-        sa.Column('spool_weight', sa.Float(), nullable=True))
-    
+        sa.Column("id", sa.Integer, primary_key=True),
+        sa.Column("weight", sa.Float(), nullable=True),
+        sa.Column("spool_weight", sa.Float(), nullable=True),
+    )
+
     spool = sa.Table(
-        'spool',
+        "spool",
         sa.MetaData(),
-        sa.Column('id', sa.Integer, primary_key=True),
-        sa.Column('filament_id', sa.Integer),
-        sa.Column('initial_weight', sa.Float(), nullable=False, comment="The initial total weight of the spool (gross weight)."),
-        sa.Column('empty_weight', sa.Float(), nullable=False, comment="The weight of the empty spool (tare weight).")
-    ) 
-    
-    initial_weight = sa.select((filament.c.weight + filament.c.spool_weight).label("initial_weight")).where(filament.c.id == spool.c.filament_id).scalar_subquery()
+        sa.Column("id", sa.Integer, primary_key=True),
+        sa.Column("filament_id", sa.Integer),
+        sa.Column(
+            "initial_weight",
+            sa.Float(),
+            nullable=False,
+        ),
+        sa.Column(
+            "empty_weight",
+            sa.Float(),
+            nullable=False,
+        ),
+    )
+
+    initial_weight = (
+        sa.select((filament.c.weight + filament.c.spool_weight).label("initial_weight"))
+        .where(filament.c.id == spool.c.filament_id)
+        .scalar_subquery()
+    )
     empty_weight = sa.select(filament.c.spool_weight).where(filament.c.id == spool.c.filament_id).scalar_subquery()
 
     set_initial_weight = sa.update(spool).values(initial_weight=initial_weight)
@@ -43,4 +60,3 @@ def upgrade() -> None:
 
 def downgrade() -> None:
     """Perform the downgrade."""
-    pass
diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index ca384d8..7da98ec 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -194,12 +194,8 @@ async def update(
         if k == "filament_id":
             spool.filament = await filament.get_by_id(db, v)
             # If there is no initial_weight, calculate it from the filament weight
-            if (
-                spool.initial_weight is None
-                and spool.empty_weight is None
-                and spool.filament.weight is not None
-            ):
-                spool_weight = (spool.empty_weight if spool.empty_weight is not None else 0)
+            if spool.initial_weight is None and spool.empty_weight is None and spool.filament.weight is not None:
+                spool_weight = spool.empty_weight if spool.empty_weight is not None else 0
                 spool.initial_weight = spool.filament.weight + spool_weight
                 spool.empty_weight = spool_weight
 

From e68f88da2ad59f408e95b06344f22e2e3b4328f9 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Tue, 26 Mar 2024 20:35:50 -0400
Subject: [PATCH 03/15] Added empty spool weight as an option field for the
 vendor

---
 ...-5f069e51bd89_vendor_empty_spool_weight.py | 31 +++++++++++++++++++
 spoolman/database/filament.py                 |  3 ++
 spoolman/database/models.py                   |  5 +--
 spoolman/database/spool.py                    |  3 ++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 migrations/versions/2024_03_26_1507-5f069e51bd89_vendor_empty_spool_weight.py

diff --git a/migrations/versions/2024_03_26_1507-5f069e51bd89_vendor_empty_spool_weight.py b/migrations/versions/2024_03_26_1507-5f069e51bd89_vendor_empty_spool_weight.py
new file mode 100644
index 0000000..7403eaf
--- /dev/null
+++ b/migrations/versions/2024_03_26_1507-5f069e51bd89_vendor_empty_spool_weight.py
@@ -0,0 +1,31 @@
+"""vendor empty spool weight.
+
+Revision ID: 5f069e51bd89
+Revises: 304a32906234
+Create Date: 2024-03-26 15:07:18.366290
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "5f069e51bd89"
+down_revision = "304a32906234"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """Perform the upgrade."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "vendor",
+        sa.Column("empty_spool_weight", sa.Float(), nullable=True, comment="The weight of an empty spool."),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Perform the downgrade."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("vendor", "empty_spool_weight")
+    # ### end Alembic commands ###
diff --git a/spoolman/database/filament.py b/spoolman/database/filament.py
index a87f27a..a8f472a 100644
--- a/spoolman/database/filament.py
+++ b/spoolman/database/filament.py
@@ -48,6 +48,9 @@ async def create(
     vendor_item: Optional[models.Vendor] = None
     if vendor_id is not None:
         vendor_item = await vendor.get_by_id(db, vendor_id)
+        # default spool weight from vendor
+        if spool_weight is None and vendor_item.empty_spool_weight is not None:
+            spool_weight = vendor_item.empty_spool_weight
 
     filament = models.Filament(
         name=name,
diff --git a/spoolman/database/models.py b/spoolman/database/models.py
index b009bdf..1a2d5bd 100644
--- a/spoolman/database/models.py
+++ b/spoolman/database/models.py
@@ -18,6 +18,7 @@ class Vendor(Base):
     id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True)
     registered: Mapped[datetime] = mapped_column()
     name: Mapped[str] = mapped_column(String(64))
+    empty_spool_weight: Mapped[Optional[float]] = mapped_column(comment="The weight of an empty spool.")
     comment: Mapped[Optional[str]] = mapped_column(String(1024))
     filaments: Mapped[list["Filament"]] = relationship(back_populates="vendor")
     extra: Mapped[list["VendorField"]] = relationship(
@@ -64,8 +65,8 @@ class Spool(Base):
     price: Mapped[Optional[float]] = mapped_column()
     filament_id: Mapped[int] = mapped_column(ForeignKey("filament.id"))
     filament: Mapped["Filament"] = relationship(back_populates="spools")
-    initial_weight: Mapped[float] = mapped_column()
-    empty_weight: Mapped[float] = mapped_column()
+    initial_weight: Mapped[Optional[float]] = mapped_column()
+    empty_weight: Mapped[Optional[float]] = mapped_column()
     used_weight: Mapped[float] = mapped_column()
     location: Mapped[Optional[str]] = mapped_column(String(64))
     lot_nr: Mapped[Optional[str]] = mapped_column(String(64))
diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index 7da98ec..42d2e5e 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -235,6 +235,7 @@ async def use_weight_safe(db: AsyncSession, spool_id: int, weight: float) -> Non
         db (AsyncSession): Database session
         spool_id (int): Spool ID
         weight (float): Filament weight to consume, in grams
+
     """
     await db.execute(
         sqlalchemy.update(models.Spool)
@@ -261,6 +262,7 @@ async def use_weight(db: AsyncSession, spool_id: int, weight: float) -> models.S
 
     Returns:
         models.Spool: Updated spool object
+
     """
     await use_weight_safe(db, spool_id, weight)
 
@@ -288,6 +290,7 @@ async def use_length(db: AsyncSession, spool_id: int, length: float) -> models.S
 
     Returns:
         models.Spool: Updated spool object
+
     """
     # Get filament diameter and density
     result = await db.execute(

From 3aed735ceae4d6b5de153a4f92bece08987a8cf3 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Tue, 26 Mar 2024 21:26:41 -0400
Subject: [PATCH 04/15] Updated vendor API to correct issues - Implement new UI

---
 client/public/locales/en/common.json |  4 ++++
 client/src/pages/vendors/create.tsx  | 18 +++++++++++++++++-
 client/src/pages/vendors/edit.tsx    | 18 +++++++++++++++++-
 client/src/pages/vendors/list.tsx    | 13 +++++++++++--
 client/src/pages/vendors/model.tsx   |  1 +
 client/src/pages/vendors/show.tsx    |  2 ++
 spoolman/api/v1/models.py            |  2 ++
 spoolman/api/v1/vendor.py            | 11 ++++++-----
 spoolman/database/vendor.py          |  2 ++
 9 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/client/public/locales/en/common.json b/client/public/locales/en/common.json
index 53160f8..16d7800 100644
--- a/client/public/locales/en/common.json
+++ b/client/public/locales/en/common.json
@@ -227,9 +227,13 @@
         "fields": {
             "id": "ID",
             "name": "Name",
+            "empty_spool_weight": "Empty Spool Weight",
             "registered": "Registered",
             "comment": "Comment"
         },
+        "fields_help": {
+            "empty_spool_weight": "The weight of an empty spool from this vendor."
+        },
         "titles": {
             "create": "Create Vendor",
             "clone": "Clone Vendor",
diff --git a/client/src/pages/vendors/create.tsx b/client/src/pages/vendors/create.tsx
index 9649ccd..69ac0ae 100644
--- a/client/src/pages/vendors/create.tsx
+++ b/client/src/pages/vendors/create.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { HttpError, IResourceComponentsProps, useTranslate } from "@refinedev/core";
 import { Create, useForm } from "@refinedev/antd";
-import { Button, Form, Input, Typography } from "antd";
+import { Button, Form, Input, Typography, InputNumber } from "antd";
 import TextArea from "antd/es/input/TextArea";
 import { IVendor, IVendorParsedExtras } from "./model";
 import { EntityType, useGetFields } from "../../utils/queryFields";
@@ -85,6 +85,22 @@ export const VendorCreate: React.FC<IResourceComponentsProps & CreateOrCloneProp
         >
           <TextArea maxLength={1024} />
         </Form.Item>
+        <Form.Item
+          label={t("vendor.fields.empty_spool_weight")}
+          help={t("vendor.fields_help.empty_spool_weight")}
+          name={["empty_spool_weight"]}
+          rules={[
+            {
+              required: false,
+              type: "number",
+              min: 0,
+            },
+          ]}
+        >
+          <InputNumber 
+            addonAfter="g"
+            precision={1}/>
+        </Form.Item>
         <Typography.Title level={5}>{t("settings.extra_fields.tab")}</Typography.Title>
         {extraFields.data?.map((field, index) => (
           <ExtraFieldFormItem key={index} field={field} />
diff --git a/client/src/pages/vendors/edit.tsx b/client/src/pages/vendors/edit.tsx
index 330a251..d8fd665 100644
--- a/client/src/pages/vendors/edit.tsx
+++ b/client/src/pages/vendors/edit.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { HttpError, IResourceComponentsProps, useTranslate } from "@refinedev/core";
 import { Edit, useForm } from "@refinedev/antd";
-import { Form, Input, DatePicker, message, Alert, Typography } from "antd";
+import { Form, Input, DatePicker, message, Alert, Typography, InputNumber } from "antd";
 import dayjs from "dayjs";
 import TextArea from "antd/es/input/TextArea";
 import { IVendor, IVendorParsedExtras } from "./model";
@@ -100,6 +100,22 @@ export const VendorEdit: React.FC<IResourceComponentsProps> = () => {
         >
           <TextArea maxLength={1024} />
         </Form.Item>
+        <Form.Item
+          label={t("vendor.fields.empty_spool_weight")}
+          help={t("vendor.fields_help.empty_spool_weight")}
+          name={["empty_spool_weight"]}
+          rules={[
+            {
+              required: false,
+              type: "number",
+              min: 0,
+            },
+          ]}
+        >
+          <InputNumber 
+            addonAfter="g"
+            precision={1}/>
+        </Form.Item>
         <Typography.Title level={5}>{t("settings.extra_fields.tab")}</Typography.Title>
         {extraFields.data?.map((field, index) => (
           <ExtraFieldFormItem key={index} field={field} />
diff --git a/client/src/pages/vendors/list.tsx b/client/src/pages/vendors/list.tsx
index a79e16d..dba62ec 100644
--- a/client/src/pages/vendors/list.tsx
+++ b/client/src/pages/vendors/list.tsx
@@ -7,7 +7,7 @@ import utc from "dayjs/plugin/utc";
 import { IVendor } from "./model";
 import { TableState, useInitialTableState, useStoreInitialState } from "../../utils/saveload";
 import { EditOutlined, EyeOutlined, FilterOutlined, PlusSquareOutlined } from "@ant-design/icons";
-import { DateColumn, RichColumn, SortedColumn, ActionsColumn, CustomFieldColumn } from "../../components/column";
+import { DateColumn, RichColumn, SortedColumn, ActionsColumn, CustomFieldColumn, NumberColumn } from "../../components/column";
 import { useLiveify } from "../../components/liveify";
 import { removeUndefined } from "../../utils/filtering";
 import { EntityType, useGetFields } from "../../utils/queryFields";
@@ -17,7 +17,7 @@ dayjs.extend(utc);
 
 const namespace = "vendorList-v2";
 
-const allColumns: (keyof IVendor & string)[] = ["id", "name", "registered", "comment"];
+const allColumns: (keyof IVendor & string)[] = ["id", "name", "registered", "comment", "empty_spool_weight"];
 
 export const VendorList: React.FC<IResourceComponentsProps> = () => {
   const t = useTranslate();
@@ -171,6 +171,15 @@ export const VendorList: React.FC<IResourceComponentsProps> = () => {
             ...commonProps,
             id: "registered",
             i18ncat: "vendor",
+            width: 200,
+          }),
+          NumberColumn({
+            ...commonProps,
+            id: "empty_spool_weight",
+            i18ncat: "vendor",
+            unit: "g",
+            maxDecimals: 0,
+            width: 200,
           }),
           ...(extraFields.data?.map((field) => {
             return CustomFieldColumn({
diff --git a/client/src/pages/vendors/model.tsx b/client/src/pages/vendors/model.tsx
index ac1bf83..85d33ad 100644
--- a/client/src/pages/vendors/model.tsx
+++ b/client/src/pages/vendors/model.tsx
@@ -3,6 +3,7 @@ export interface IVendor {
   registered: string;
   name: string;
   comment?: string;
+  empty_spool_weight?: number;
   extra: { [key: string]: string };
 }
 
diff --git a/client/src/pages/vendors/show.tsx b/client/src/pages/vendors/show.tsx
index c161218..760eae3 100644
--- a/client/src/pages/vendors/show.tsx
+++ b/client/src/pages/vendors/show.tsx
@@ -42,6 +42,8 @@ export const VendorShow: React.FC<IResourceComponentsProps> = () => {
       <TextField value={record?.name} />
       <Title level={5}>{t("vendor.fields.comment")}</Title>
       <TextField value={enrichText(record?.comment)} />
+      <Title level={5}>{t("vendor.fields.empty_spool_weight")}</Title>
+      <TextField value={record?.empty_spool_weight} />
       <Title level={4}>{t("settings.extra_fields.tab")}</Title>
       {extraFields?.data?.map((field, index) => (
         <ExtraFieldDisplay key={index} field={field} value={record?.extra[field.key]} />
diff --git a/spoolman/api/v1/models.py b/spoolman/api/v1/models.py
index 3d36e9b..3b7f267 100644
--- a/spoolman/api/v1/models.py
+++ b/spoolman/api/v1/models.py
@@ -60,6 +60,7 @@ class Vendor(BaseModel):
     registered: datetime = Field(description="When the vendor was registered in the database. UTC Timezone.")
     name: str = Field(max_length=64, description="Vendor name.", example="Polymaker")
     comment: Optional[str] = Field(max_length=1024, description="Free text comment about this vendor.", example="")
+    empty_spool_weight: Optional[float] = Field(gt=0, description="The empty spool weight, in grams.", example=140)
     extra: dict[str, str] = Field(
         description=(
             "Extra fields for this vendor. All values are JSON-encoded data. "
@@ -75,6 +76,7 @@ class Vendor(BaseModel):
             registered=item.registered,
             name=item.name,
             comment=item.comment,
+            empty_spool_weight=item.empty_spool_weight,
             extra={field.key: field.value for field in item.extra},
         )
 
diff --git a/spoolman/api/v1/vendor.py b/spoolman/api/v1/vendor.py
index 260e609..a7fad79 100644
--- a/spoolman/api/v1/vendor.py
+++ b/spoolman/api/v1/vendor.py
@@ -33,6 +33,11 @@ class VendorParameters(BaseModel):
         description="Free text comment about this vendor.",
         example="",
     )
+    empty_spool_weight: Optional[float] = Field(
+        ge=0,
+        description="The weight of an empty spool.",
+        example=200,
+    )
     extra: Optional[dict[str, str]] = Field(
         None,
         description="Extra fields for this vendor.",
@@ -41,11 +46,6 @@ class VendorParameters(BaseModel):
 
 class VendorUpdateParameters(VendorParameters):
     name: Optional[str] = Field(max_length=64, description="Vendor name.", example="Polymaker")
-    comment: Optional[str] = Field(
-        max_length=1024,
-        description="Free text comment about this vendor.",
-        example="",
-    )
 
 
 @router.get(
@@ -190,6 +190,7 @@ async def create(  # noqa: ANN201
         db=db,
         name=body.name,
         comment=body.comment,
+        empty_spool_weight=body.empty_spool_weight,
         extra=body.extra,
     )
 
diff --git a/spoolman/database/vendor.py b/spoolman/database/vendor.py
index 67ba082..85ae081 100644
--- a/spoolman/database/vendor.py
+++ b/spoolman/database/vendor.py
@@ -19,6 +19,7 @@ async def create(
     db: AsyncSession,
     name: Optional[str] = None,
     comment: Optional[str] = None,
+    empty_spool_weight: Optional[float] = None,
     extra: Optional[dict[str, str]] = None,
 ) -> models.Vendor:
     """Add a new vendor to the database."""
@@ -26,6 +27,7 @@ async def create(
         name=name,
         registered=datetime.utcnow().replace(microsecond=0),
         comment=comment,
+        empty_spool_weight=empty_spool_weight,
         extra=[models.VendorField(key=k, value=v) for k, v in (extra or {}).items()],
     )
     db.add(vendor)

From 3ea4937f24c67e67bf862089bb6e99e4794a86a6 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Wed, 27 Mar 2024 14:47:05 -0400
Subject: [PATCH 05/15] Updated spool UIs (create/edit)

---
 client/public/locales/en/common.json |   4 +
 client/src/pages/spools/create.tsx   | 148 +++++++++++++++++------
 client/src/pages/spools/edit.tsx     | 168 ++++++++++++++++++++-------
 client/src/pages/spools/model.tsx    |   8 ++
 spoolman/api/v1/models.py            |  26 ++++-
 spoolman/api/v1/spool.py             |  28 ++++-
 spoolman/database/spool.py           |  47 ++++++++
 7 files changed, 349 insertions(+), 80 deletions(-)

diff --git a/client/public/locales/en/common.json b/client/public/locales/en/common.json
index 16d7800..368846c 100644
--- a/client/public/locales/en/common.json
+++ b/client/public/locales/en/common.json
@@ -144,6 +144,8 @@
             "measured_weight": "Measured Weight",
             "used_length": "Used Length",
             "remaining_length": "Remaining Length",
+            "initial_weight": "Initial Weight",
+            "empty_weight": "Empty Weight",
             "location": "Location",
             "lot_nr": "Lot Nr",
             "first_used": "First Used",
@@ -158,6 +160,8 @@
             "used_weight": "How much filament has been used from the spool. A new spool should have 0g used.",
             "remaining_weight": "How much filament is left on the spool. For a new spool this should match the spool weight.",
             "measured_weight": "How much the filament and spool weigh.",
+            "initial_weight": "The initial Total Weight of the filament and spool.",
+            "empty_weight": "The weight of the spool when it is empty.",
             "location": "Where the spool is located if you have multiple locations where you store your spools.",
             "lot_nr": "Manufacturer's lot number. Can be used to ensure a print has consistent color if multiple spools are used."
         },
diff --git a/client/src/pages/spools/create.tsx b/client/src/pages/spools/create.tsx
index deeaf4e..e60b71c 100644
--- a/client/src/pages/spools/create.tsx
+++ b/client/src/pages/spools/create.tsx
@@ -107,9 +107,6 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
   });
   filamentOptions?.sort((a, b) => a.label.localeCompare(b.label, undefined, { sensitivity: "base" }));
 
-  const [defaultEmptySpoolWeight, setDefaultEmptySpoolWeight] = useState(0);
-  const [defaultInitialTotalWeight, setDefaultInitialTotalWeight] = useState(0);
-
   const [weightToEnter, setWeightToEnter] = useState(1);
   const [usedWeight, setUsedWeight] = useState(0);
 
@@ -117,28 +114,26 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
   const selectedFilament = filamentOptions?.find((obj) => {
     return obj.value === selectedFilamentID;
   });
-  const filamentWeight = selectedFilament?.weight || 0;
-  const spoolWeight = selectedFilament?.spool_weight || 0;
-
+ 
   const filamentChange = (newID: number) => {
+    
     const newSelectedFilament = filamentOptions?.find((obj) => {
       return obj.value === newID;
     });
+
+    const initial_weight = form.getFieldValue("initial_weight") as number ?? 0;
+    const empty_weight = form.getFieldValue("empty_weight") as number ?? 0;
+    
     const newFilamentWeight = newSelectedFilament?.weight || 0;
     const newSpoolWeight = newSelectedFilament?.spool_weight || 0;
 
-    setDefaultEmptySpoolWeight(newSpoolWeight);
-    setDefaultInitialTotalWeight(newFilamentWeight + newSpoolWeight);
-
-    if (weightToEnter >= 3) {
-      if (!(newFilamentWeight && newSpoolWeight)) {
-        setWeightToEnter(2);
-      }
+    const currentCalculatedFilamentWeight = getTotalWeightFromFilament();
+    if ((initial_weight === 0 || initial_weight === currentCalculatedFilamentWeight) && newFilamentWeight > 0) {
+      form.setFieldValue("initial_weight", newFilamentWeight + newSpoolWeight);
     }
-    if (weightToEnter >= 2) {
-      if (!newFilamentWeight) {
-        setWeightToEnter(1);
-      }
+
+    if ((empty_weight === 0 || empty_weight === (selectedFilament?.spool_weight ?? 0)) && newSpoolWeight > 0) {
+      form.setFieldValue("empty_weight", newSpoolWeight);
     }
   };
 
@@ -166,6 +161,98 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
     setQuantity(quantity - 1);
   };
 
+  const getSpoolTotalWeight = (): number => {
+    const initial_weight = form.getFieldValue("initial_weight") as number;
+    const empty_weight = form.getFieldValue("empty_weight") as number;
+    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
+    return initial_weight ?? (selectedFilament?.weight ?? 0) + spool_weight;
+  };
+
+  const getTotalWeightFromFilament = (): number => {
+    return (selectedFilament?.weight ?? 0) + (selectedFilament?.spool_weight ?? 0);
+  }
+
+  const getFilamentWeight = (): number => {
+    const initial_weight = form.getFieldValue("initial_weight") as number;
+    const empty_weight = form.getFieldValue("empty_weight") as number;
+    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
+    if (initial_weight) {
+      return initial_weight - (spool_weight ?? 0);
+    }
+    return selectedFilament?.weight ?? 0;
+  }
+
+  const getMeasuredWeight = (): number => {
+    const initial_weight = form.getFieldValue("initial_weight") as number;
+
+    if (initial_weight) {
+      return initial_weight - usedWeight;
+    }
+    const empty_weight = form.getFieldValue("empty_weight") as number;
+    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
+
+    if (selectedFilament?.weight && spool_weight) {
+      return selectedFilament?.weight - usedWeight + spool_weight;
+    }
+    return 0;
+  }
+
+  const getRemainingWeight = (): number => {
+    const initial_weight = form.getFieldValue("initial_weight") as number ?? 0;
+    const empty_weight = form.getFieldValue("empty_weight") as number;
+    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
+
+    let remaining_weight = 0;
+
+    if (initial_weight === 0) {
+      remaining_weight = (selectedFilament?.weight ?? 0) - usedWeight;
+    }
+    else {
+      remaining_weight = initial_weight - spool_weight - usedWeight;
+    }
+    
+    return (remaining_weight >= 0) ? remaining_weight : 0;
+  }
+
+  const isMeasuredWeightEnabled = (): boolean => {
+
+    if (!isRemainingWeightEnabled()) {
+      return false;
+    }
+
+    const empty_weight = form.getFieldValue("empty_weight") as number;
+
+    return (empty_weight || selectedFilament?.spool_weight) ? true : false;
+  }
+  
+  const isRemainingWeightEnabled = (): boolean => {
+    const initial_weight = form.getFieldValue("initial_weight") as number;
+
+    if (initial_weight) {
+      return true;
+    }
+
+    return selectedFilament?.weight ? true : false;
+  }
+
+  React.useEffect(() => {
+    if (weightToEnter >= 3) 
+    {
+      if (!isMeasuredWeightEnabled()) {
+        setWeightToEnter(2);
+        return;
+      }
+    }
+    if (weightToEnter >= 2)
+    {
+      if (!isRemainingWeightEnabled()) {
+        setWeightToEnter(1);
+        return;
+      }
+    }
+  }, [selectedFilament, weightChange])
+
+
   return (
     <Create
       title={props.mode === "create" ? t("spool.titles.create") : t("spool.titles.clone")}
@@ -242,8 +329,8 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
           />
         </Form.Item>
         <Form.Item
-          label={t("filament.fields.price")}
-          help={t("filament.fields_help.price")}
+          label={t("spool.fields.price")}
+          help={t("spool.fields_help.price")}
           name={["price"]}
           rules={[
             {
@@ -272,10 +359,7 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             },
           ]}
         >
-          <InputNumber 
-            addonAfter="g"
-            precision={1}
-            defaultValue={defaultInitialTotalWeight} />
+          <InputNumber addonAfter="g" precision={1}/>
         </Form.Item>
 
         <Form.Item
@@ -290,10 +374,7 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             },
           ]}
         >
-          <InputNumber 
-            addonAfter="g" 
-            precision={1}
-            defaultValue={defaultEmptySpoolWeight} />
+          <InputNumber addonAfter="g" precision={1} />
         </Form.Item>
 
         <Form.Item hidden={true} name={["used_weight"]} initialValue={0}>
@@ -309,10 +390,10 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             value={weightToEnter}
           >
             <Radio.Button value={1}>{t("spool.fields.used_weight")}</Radio.Button>
-            <Radio.Button value={2} disabled={!filamentWeight}>
+            <Radio.Button value={2} disabled={!isRemainingWeightEnabled()}>
               {t("spool.fields.remaining_weight")}
             </Radio.Button>
-            <Radio.Button value={3} disabled={!(filamentWeight && spoolWeight)}>
+            <Radio.Button value={3} disabled={!isMeasuredWeightEnabled()}>
               {t("spool.fields.measured_weight")}
             </Radio.Button>
           </Radio.Group>
@@ -344,9 +425,9 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             formatter={numberFormatter}
             parser={numberParser}
             disabled={weightToEnter != 2}
-            value={filamentWeight ? filamentWeight - usedWeight : 0}
+            value={getRemainingWeight()}
             onChange={(value) => {
-              weightChange(filamentWeight - (value ?? 0));
+              weightChange(getFilamentWeight() - (value ?? 0));
             }}
           />
         </Form.Item>
@@ -362,9 +443,10 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             formatter={numberFormatter}
             parser={numberParser}
             disabled={weightToEnter != 3}
-            value={filamentWeight && spoolWeight ? filamentWeight - usedWeight + spoolWeight : 0}
+            value={getMeasuredWeight()}
             onChange={(value) => {
-              weightChange(filamentWeight - ((value ?? 0) - spoolWeight));
+              const totalWeight = getSpoolTotalWeight();
+              weightChange(totalWeight - (value ?? 0));
             }}
           />
         </Form.Item>
diff --git a/client/src/pages/spools/edit.tsx b/client/src/pages/spools/edit.tsx
index 35b335b..e118e97 100644
--- a/client/src/pages/spools/edit.tsx
+++ b/client/src/pages/spools/edit.tsx
@@ -5,7 +5,7 @@ import { Form, Input, DatePicker, Select, InputNumber, Radio, Divider, Alert, Ty
 import dayjs from "dayjs";
 import TextArea from "antd/es/input/TextArea";
 import { IFilament } from "../filaments/model";
-import { ISpool, ISpoolParsedExtras } from "./model";
+import { ISpool, ISpoolParsedExtras, WeightToEnter } from "./model";
 import { numberFormatter, numberParser } from "../../utils/parsing";
 import { useSpoolmanLocations } from "../../components/otherModels";
 import { message } from "antd/lib";
@@ -21,12 +21,6 @@ We also need to stringify them again before sending them back to the API, which
 the form's onFinish method. Form.Item's normalize should do this, but it doesn't seem to work.
 */
 
-enum WeightToEnter {
-  used_weight = 1,
-  remaining_weight = 2,
-  measured_weight = 3,
-}
-
 export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
   const t = useTranslate();
   const [messageApi, contextHolder] = message.useMessage();
@@ -56,9 +50,6 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
     formProps.initialValues = ParsedExtras(formProps.initialValues);
   }
 
-  const [defaultEmptySpoolWeight, setDefaultEmptySpoolWeight] = useState(0);
-  const [defaultInitialTotalWeight, setDefaultInitialTotalWeight] = useState(0);
-
   // Override the form's onFinish method to stringify the extra fields
   const originalOnFinish = formProps.onFinish;
   formProps.onFinish = (allValues: ISpoolParsedExtras) => {
@@ -103,38 +94,34 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
   const selectedFilament = filamentOptions?.find((obj) => {
     return obj.value === selectedFilamentID;
   });
-  const filamentWeight = selectedFilament?.weight || 0;
-  const spoolWeight = selectedFilament?.spool_weight || 0;
-
+ 
   const filamentChange = (newID: number) => {
+    
     const newSelectedFilament = filamentOptions?.find((obj) => {
       return obj.value === newID;
     });
 
+    const initial_weight = form.getFieldValue("initial_weight") as number ?? 0;
+    const empty_weight = form.getFieldValue("empty_weight") as number ?? 0;
+    
     const newFilamentWeight = newSelectedFilament?.weight || 0;
     const newSpoolWeight = newSelectedFilament?.spool_weight || 0;
 
-    setDefaultEmptySpoolWeight(newSpoolWeight);
-    setDefaultInitialTotalWeight(newFilamentWeight + newSpoolWeight);
-
-    const filamentHasWeight = newSelectedFilament?.weight || 0;
-    const filamentHasSpoolWeight = newSelectedFilament?.spool_weight || 0;
-
-    if (weightToEnter == WeightToEnter.measured_weight) {
-      if (!(filamentHasWeight && filamentHasSpoolWeight)) {
-        setWeightToEnter(WeightToEnter.remaining_weight);
-      }
+    const currentCalculatedFilamentWeight = getTotalWeightFromFilament();
+    if ((initial_weight === 0 || initial_weight === currentCalculatedFilamentWeight) && newFilamentWeight > 0) {
+      form.setFieldValue("initial_weight", newFilamentWeight + newSpoolWeight);
     }
-    if (weightToEnter == WeightToEnter.remaining_weight || weightToEnter == WeightToEnter.measured_weight) {
-      if (!filamentHasWeight) {
-        setWeightToEnter(WeightToEnter.used_weight);
-      }
+
+    if ((empty_weight === 0 || empty_weight === (selectedFilament?.spool_weight ?? 0)) && newSpoolWeight > 0) {
+      form.setFieldValue("empty_weight", newSpoolWeight);
     }
   };
 
   const weightChange = (weight: number) => {
     setUsedWeight(weight);
-    form.setFieldValue("used_weight", weight);
+    form.setFieldsValue({
+      used_weight: weight,
+    });
   };
 
   const locations = useSpoolmanLocations(true);
@@ -145,6 +132,97 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
     allLocations.push(newLocation.trim());
   }
 
+  const getSpoolTotalWeight = (): number => {
+    const initial_weight = form.getFieldValue("initial_weight") as number;
+    const empty_weight = form.getFieldValue("empty_weight") as number;
+    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
+    return initial_weight ?? (selectedFilament?.weight ?? 0) + spool_weight;
+  };
+
+  const getTotalWeightFromFilament = (): number => {
+    return (selectedFilament?.weight ?? 0) + (selectedFilament?.spool_weight ?? 0);
+  }
+
+  const getFilamentWeight = (): number => {
+    const initial_weight = form.getFieldValue("initial_weight") as number;
+    const empty_weight = form.getFieldValue("empty_weight") as number;
+    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
+    if (initial_weight) {
+      return initial_weight - (spool_weight ?? 0);
+    }
+    return selectedFilament?.weight ?? 0;
+  }
+
+  const getMeasuredWeight = (): number => {
+    const initial_weight = form.getFieldValue("initial_weight") as number;
+
+    if (initial_weight) {
+      return initial_weight - usedWeight;
+    }
+    const empty_weight = form.getFieldValue("empty_weight") as number;
+    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
+
+    if (selectedFilament?.weight && spool_weight) {
+      return selectedFilament?.weight - usedWeight + spool_weight;
+    }
+    return 0;
+  }
+
+  const getRemainingWeight = (): number => {
+    const initial_weight = form.getFieldValue("initial_weight") as number ?? 0;
+    const empty_weight = form.getFieldValue("empty_weight") as number;
+    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
+
+    let remaining_weight = 0;
+
+    if (initial_weight === 0) {
+      remaining_weight = (selectedFilament?.weight ?? 0) - usedWeight;
+    }
+    else {
+      remaining_weight = initial_weight - spool_weight - usedWeight;
+    }
+    
+    return (remaining_weight >= 0) ? remaining_weight : 0;
+  }
+
+  const isMeasuredWeightEnabled = (): boolean => {
+
+    if (!isRemainingWeightEnabled()) {
+      return false;
+    }
+
+    const empty_weight = form.getFieldValue("empty_weight") as number;
+
+    return (empty_weight || selectedFilament?.spool_weight) ? true : false;
+  }
+  
+  const isRemainingWeightEnabled = (): boolean => {
+    const initial_weight = form.getFieldValue("initial_weight") as number;
+
+    if (initial_weight) {
+      return true;
+    }
+
+    return selectedFilament?.weight ? true : false;
+  }
+
+  React.useEffect(() => {
+    if (weightToEnter >= WeightToEnter.measured_weight) 
+    {
+      if (!isMeasuredWeightEnabled()) {
+        setWeightToEnter(WeightToEnter.remaining_weight);
+        return;
+      }
+    }
+    if (weightToEnter >= WeightToEnter.remaining_weight)
+    {
+      if (!isRemainingWeightEnabled()) {
+        setWeightToEnter(WeightToEnter.used_weight);
+        return;
+      }
+    }
+  }, [selectedFilament, weightChange])
+
   const initialUsedWeight = formProps.initialValues?.used_weight || 0;
   useEffect(() => {
     if (initialUsedWeight) {
@@ -260,10 +338,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
             },
           ]}
         >
-          <InputNumber 
-            addonAfter="g"
-            precision={1}
-            defaultValue={defaultInitialTotalWeight} />
+          <InputNumber addonAfter="g" precision={1}/>
         </Form.Item>
 
         <Form.Item
@@ -278,15 +353,13 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
             },
           ]}
         >
-          <InputNumber 
-            addonAfter="g" 
-            precision={1}
-            defaultValue={defaultEmptySpoolWeight} />
+          <InputNumber addonAfter="g" precision={1} />
         </Form.Item>
 
         <Form.Item hidden={true} name={["used_weight"]} initialValue={0}>
           <InputNumber value={usedWeight} />
         </Form.Item>
+
         <Form.Item label={t("spool.fields.weight_to_use")} help={t("spool.fields_help.weight_to_use")}>
           <Radio.Group
             onChange={(value) => {
@@ -296,10 +369,10 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
             value={weightToEnter}
           >
             <Radio.Button value={WeightToEnter.used_weight}>{t("spool.fields.used_weight")}</Radio.Button>
-            <Radio.Button value={WeightToEnter.remaining_weight} disabled={!filamentWeight}>
+            <Radio.Button value={WeightToEnter.remaining_weight} disabled={!isRemainingWeightEnabled()}>
               {t("spool.fields.remaining_weight")}
             </Radio.Button>
-            <Radio.Button value={WeightToEnter.measured_weight} disabled={!(filamentWeight && spoolWeight)}>
+            <Radio.Button value={WeightToEnter.measured_weight} disabled={!isMeasuredWeightEnabled()}>
               {t("spool.fields.measured_weight")}
             </Radio.Button>
           </Radio.Group>
@@ -318,7 +391,10 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
             }}
           />
         </Form.Item>
-        <Form.Item label={t("spool.fields.remaining_weight")} help={t("spool.fields_help.remaining_weight")}>
+        <Form.Item
+          label={t("spool.fields.remaining_weight")}
+          help={t("spool.fields_help.remaining_weight")}
+        >
           <InputNumber
             min={0}
             addonAfter="g"
@@ -326,13 +402,16 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
             formatter={numberFormatter}
             parser={numberParser}
             disabled={weightToEnter != WeightToEnter.remaining_weight}
-            value={filamentWeight ? filamentWeight - usedWeight : 0}
+            value={getRemainingWeight()}
             onChange={(value) => {
-              weightChange(filamentWeight - (value ?? 0));
+              weightChange(getFilamentWeight() - (value ?? 0));
             }}
           />
         </Form.Item>
-        <Form.Item label={t("spool.fields.measured_weight")} help={t("spool.fields_help.measured_weight")}>
+        <Form.Item
+          label={t("spool.fields.measured_weight")}
+          help={t("spool.fields_help.measured_weight")}
+        >
           <InputNumber
             min={0}
             addonAfter="g"
@@ -340,9 +419,10 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
             formatter={numberFormatter}
             parser={numberParser}
             disabled={weightToEnter != WeightToEnter.measured_weight}
-            value={filamentWeight && spoolWeight ? filamentWeight - usedWeight + spoolWeight : 0}
+            value={getMeasuredWeight()}
             onChange={(value) => {
-              weightChange(filamentWeight - ((value ?? 0) - spoolWeight));
+              const totalWeight = getSpoolTotalWeight();
+              weightChange(totalWeight - (value ?? 0));
             }}
           />
         </Form.Item>
diff --git a/client/src/pages/spools/model.tsx b/client/src/pages/spools/model.tsx
index a98a49f..3e49b92 100644
--- a/client/src/pages/spools/model.tsx
+++ b/client/src/pages/spools/model.tsx
@@ -1,5 +1,11 @@
 import { IFilament } from "../filaments/model";
 
+export enum WeightToEnter {
+  used_weight = 1,
+  remaining_weight = 2,
+  measured_weight = 3,
+}
+
 export interface ISpool {
   id: number;
   registered: string;
@@ -7,6 +13,8 @@ export interface ISpool {
   last_used?: string;
   filament: IFilament;
   price?: number;
+  initial_weight?: number;
+  empty_weight?: number;
   remaining_weight?: number;
   used_weight: number;
   remaining_length?: number;
diff --git a/spoolman/api/v1/models.py b/spoolman/api/v1/models.py
index 3b7f267..64d0b98 100644
--- a/spoolman/api/v1/models.py
+++ b/spoolman/api/v1/models.py
@@ -187,6 +187,18 @@ class Spool(BaseModel):
         ),
         example=500.6,
     )
+    initial_weight: Optional[float] = Field(
+        default=None,
+        ge=0,
+        description=("Initial weight of the filament and spool (gross weight)"),
+        example=1246,
+    )
+    empty_weight: Optional[float] = Field(
+        default=None,
+        ge=0,
+        description=("Weight of an empty spool (tare weight)."),
+        example=246,
+    )
     used_weight: float = Field(ge=0, description="Consumed weight of filament from the spool in grams.", example=500.3)
     remaining_length: Optional[float] = Field(
         default=None,
@@ -228,7 +240,17 @@ class Spool(BaseModel):
 
         remaining_weight: Optional[float] = None
         remaining_length: Optional[float] = None
-        if filament.weight is not None:
+
+        if item.initial_weight is not None:
+            filament_spool_weight = item.filament.spool_weight if item.filament.spool_weight is not None else 0
+            spool_weight = item.empty_weight if item.empty_weight is not None else filament_spool_weight
+            remaining_weight = max(item.initial_weight - spool_weight - item.used_weight, 0)
+            remaining_length = length_from_weight(
+                weight=remaining_weight,
+                density=filament.density,
+                diameter=filament.diameter,
+            )
+        elif filament.weight is not None:
             remaining_weight = max(filament.weight - item.used_weight, 0)
             remaining_length = length_from_weight(
                 weight=remaining_weight,
@@ -249,6 +271,8 @@ class Spool(BaseModel):
             last_used=item.last_used,
             filament=filament,
             price=item.price,
+            initial_weight=item.initial_weight,
+            empty_weight=item.empty_weight,
             used_weight=item.used_weight,
             used_length=used_length,
             remaining_weight=remaining_weight,
diff --git a/spoolman/api/v1/spool.py b/spoolman/api/v1/spool.py
index e701fca..3ecbefd 100644
--- a/spoolman/api/v1/spool.py
+++ b/spoolman/api/v1/spool.py
@@ -42,12 +42,12 @@ class SpoolParameters(BaseModel):
     )
     initial_weight: Optional[float] = Field(
         ge=0,
-        description="The initial total weight of the spool.",
+        description="The initial total weight of the filament and spool. (gross weight)",
         example=200,
     )
     empty_weight: Optional[float] = Field(
         ge=0,
-        description="The weight of an empty spool.",
+        description="The weight of an empty spool. (tare weight)",
         example=200,
     )
     remaining_weight: Optional[float] = Field(
@@ -85,6 +85,10 @@ class SpoolUseParameters(BaseModel):
     use_weight: Optional[float] = Field(description="Filament weight to reduce by, in g.", example=5.3)
 
 
+class SpoolMeasureParameters(BaseModel):
+    weight: float = Field(description="Current gross weight of the spool.", example=200)
+
+
 @router.get(
     "",
     name="Find spool",
@@ -492,3 +496,23 @@ async def use(  # noqa: ANN201
         status_code=400,
         content={"message": "Either use_weight or use_length must be specified."},
     )
+
+
+@router.put(
+    "/{spool_id}/measure",
+    name="Use spool filament based on the current weight measurement",
+    description=("Use some weight of filament from the spool. Specify the current gross weight of the spool."),
+    response_model_exclude_none=True,
+    response_model=Spool,
+    responses={
+        400: {"model": Message},
+        404: {"model": Message},
+    },
+)
+async def measure(  # noqa: ANN201
+    db: Annotated[AsyncSession, Depends(get_db_session)],
+    spool_id: int,
+    body: SpoolMeasureParameters,
+):
+    db_item = await spool.measure(db, spool_id, body.weight)
+    return Spool.from_db(db_item)
diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index 42d2e5e..fec26fa 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -323,6 +323,53 @@ async def use_length(db: AsyncSession, spool_id: int, length: float) -> models.S
     return spool
 
 
+async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spool:
+    """Record usage based on current gross weight of spool.
+
+    Increases the used_weight attribute of the spool.
+    Updates the first_used and last_used attributes where appropriate.
+
+    Args:
+        db (AsyncSession): Database session
+        spool_id (int): Spool ID
+        weight (float): Length of filament to consume, in mm
+
+    Returns:
+        models.Spool: Updated spool object
+
+    """
+    spool_result = await db.execute(
+        sqlalchemy.select(models.Spool.initial_weight, models.Spool.used_weight).where(models.Spool.id == spool_id),
+    )
+
+    try:
+        spool_info = spool_result.one()
+    except NoResultFound as exc:
+        raise ItemNotFoundError("Spool not found.") from exc
+
+    initial_weight = spool_info[0]
+
+    if initial_weight is None:
+        # Get filament weight and spool_weight
+        result = await db.execute(
+            sqlalchemy.select(models.Filament.weight, models.Filament.spool_weight)
+            .join(models.Spool, models.Spool.filament_id == models.Filament.id)
+            .where(models.Spool.id == spool_id),
+        )
+        try:
+            filament_info = result.one()
+        except NoResultFound as exc:
+            raise ItemNotFoundError("Filament not found for spool.") from exc
+        initial_weight = filament_info[0] + filament_info[1]
+
+    # Calculate the current gross weight (initial_weight - used_weight)
+    current_use = initial_weight - spool_info[1]
+    # Calculate the weight used since last measure
+    weight_to_use = current_use - weight
+
+    return await use_weight(db, spool_id, weight_to_use)
+
+
 async def find_locations(
     *,
     db: AsyncSession,

From 19c414da4bbf19f58047bdda61697df71a354ab1 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Wed, 27 Mar 2024 15:44:54 -0400
Subject: [PATCH 06/15] Add integration tests for new measure endpoint

---
 spoolman/api/v1/spool.py                      | 13 ++-
 spoolman/database/spool.py                    | 26 ++++--
 spoolman/exceptions.py                        |  4 +
 tests_integration/tests/spool/test_measure.py | 91 +++++++++++++++++++
 4 files changed, 125 insertions(+), 9 deletions(-)
 create mode 100644 tests_integration/tests/spool/test_measure.py

diff --git a/spoolman/api/v1/spool.py b/spoolman/api/v1/spool.py
index 3ecbefd..8bec54c 100644
--- a/spoolman/api/v1/spool.py
+++ b/spoolman/api/v1/spool.py
@@ -17,7 +17,7 @@ from spoolman.api.v1.models import Message, Spool, SpoolEvent
 from spoolman.database import spool
 from spoolman.database.database import get_db_session
 from spoolman.database.utils import SortOrder
-from spoolman.exceptions import ItemCreateError
+from spoolman.exceptions import ItemCreateError, SpoolMeasureError
 from spoolman.extra_fields import EntityType, get_extra_fields, validate_extra_field_dict
 from spoolman.ws import websocket_manager
 
@@ -514,5 +514,12 @@ async def measure(  # noqa: ANN201
     spool_id: int,
     body: SpoolMeasureParameters,
 ):
-    db_item = await spool.measure(db, spool_id, body.weight)
-    return Spool.from_db(db_item)
+    try:
+        db_item = await spool.measure(db, spool_id, body.weight)
+        return Spool.from_db(db_item)
+    except SpoolMeasureError as e:
+        logger.exception("Failed to update spool measurement.")
+        return JSONResponse(
+            status_code=400,
+            content={"message": e.args[0]},
+        )
diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index fec26fa..2b32245 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -20,7 +20,7 @@ from spoolman.database.utils import (
     add_where_clause_str_opt,
     parse_nested_field,
 )
-from spoolman.exceptions import ItemCreateError, ItemNotFoundError
+from spoolman.exceptions import ItemCreateError, ItemNotFoundError, SpoolMeasureError
 from spoolman.math import weight_from_length
 from spoolman.ws import websocket_manager
 
@@ -339,17 +339,19 @@ async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spoo
 
     """
     spool_result = await db.execute(
-        sqlalchemy.select(models.Spool.initial_weight, models.Spool.used_weight).where(models.Spool.id == spool_id),
+        sqlalchemy.select(models.Spool.initial_weight, models.Spool.used_weight, models.Spool.empty_weight).where(
+            models.Spool.id == spool_id,
+        ),
     )
 
     try:
         spool_info = spool_result.one()
     except NoResultFound as exc:
-        raise ItemNotFoundError("Spool not found.") from exc
+        raise SpoolMeasureError("Spool not found.") from exc
 
     initial_weight = spool_info[0]
-
-    if initial_weight is None:
+    empty_weight = spool_info[2]
+    if initial_weight is None or empty_weight is None:
         # Get filament weight and spool_weight
         result = await db.execute(
             sqlalchemy.select(models.Filament.weight, models.Filament.spool_weight)
@@ -360,13 +362,25 @@ async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spoo
             filament_info = result.one()
         except NoResultFound as exc:
             raise ItemNotFoundError("Filament not found for spool.") from exc
-        initial_weight = filament_info[0] + filament_info[1]
+        if empty_weight is None:
+            empty_weight = filament_info[1]
+
+        if initial_weight is None:
+            initial_weight = filament_info[0] + empty_weight
+
+    # if the measurement is greater than the initial weight, raise an error
+    if weight > initial_weight:
+        raise SpoolMeasureError("Measured weight is greater than the initial weight of the spool.")
 
     # Calculate the current gross weight (initial_weight - used_weight)
     current_use = initial_weight - spool_info[1]
     # Calculate the weight used since last measure
     weight_to_use = current_use - weight
 
+    # If the measured weight is less than the empty weight, use the rest of the spool
+    if (initial_weight - weight_to_use) < empty_weight:
+        weight_to_use = current_use - empty_weight
+
     return await use_weight(db, spool_id, weight_to_use)
 
 
diff --git a/spoolman/exceptions.py b/spoolman/exceptions.py
index 9a1e642..3ebf26c 100644
--- a/spoolman/exceptions.py
+++ b/spoolman/exceptions.py
@@ -11,3 +11,7 @@ class ItemDeleteError(Exception):
 
 class ItemCreateError(Exception):
     pass
+
+
+class SpoolMeasureError(Exception):
+    pass
diff --git a/tests_integration/tests/spool/test_measure.py b/tests_integration/tests/spool/test_measure.py
new file mode 100644
index 0000000..249d98c
--- /dev/null
+++ b/tests_integration/tests/spool/test_measure.py
@@ -0,0 +1,91 @@
+"""Integration tests for the Spool API endpoint."""
+
+from datetime import datetime, timezone
+from typing import Any
+
+import httpx
+import pytest
+
+from ..conftest import URL
+
+
+@pytest.mark.parametrize("measurement", [0, 0.05, -0.05, 1000])
+def test_measure_spool(random_filament: dict[str, Any], measurement: float):
+    """Test using a spool in the database."""
+    # Setup
+    random_filament["weight"]
+    initial_weight = 1255
+    empty_weight = 246
+    start_weight = 1000
+    result = httpx.post(
+        f"{URL}/api/v1/spool",
+        json={
+            "filament_id": random_filament["id"],
+            "remaining_weight": start_weight,
+            "initial_weight": initial_weight,
+            "empty_weight": empty_weight,
+        },
+    )
+    result.raise_for_status()
+    spool = result.json()
+
+    # Execute
+    result = httpx.put(
+        f"{URL}/api/v1/spool/{spool['id']}/measure",
+        json={
+            "weight": measurement,
+        },
+    )
+    result.raise_for_status()
+
+    # Verify
+    spool = result.json()
+    # remaining_weight should be clamped so it's never negative, but used_weight should not be clamped to the net weight
+    expected_use = min(initial_weight - measurement, initial_weight - empty_weight)
+    assert spool["used_weight"] == pytest.approx(expected_use)
+    expected_remaining = max(measurement - empty_weight, 0)
+    assert spool["remaining_weight"] == pytest.approx(expected_remaining)
+    # Verify that first_used has been updated
+    diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["first_used"])).total_seconds())
+    assert diff < 60
+
+    # Verify that last_used has been updated
+    diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["last_used"])).total_seconds())
+    assert diff < 60
+
+    # Clean up
+    httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
+
+
+@pytest.mark.parametrize("measurement", [1500])  # 1500 is more than the initial weight
+def test_measure_spool_invalid(random_filament: dict[str, Any], measurement: float):
+    """Test using a spool in the database."""
+    # Setup
+    random_filament["weight"]
+    initial_weight = 1255
+    empty_weight = 246
+    start_weight = 1000
+    result = httpx.post(
+        f"{URL}/api/v1/spool",
+        json={
+            "filament_id": random_filament["id"],
+            "remaining_weight": start_weight,
+            "initial_weight": initial_weight,
+            "empty_weight": empty_weight,
+        },
+    )
+    result.raise_for_status()
+    spool = result.json()
+
+    # Execute
+    result = httpx.put(
+        f"{URL}/api/v1/spool/{spool['id']}/measure",
+        json={
+            "weight": measurement,
+        },
+    )
+    # Update is invalid if the weight is more than the initial weight
+    assert result.status_code == 400
+
+    # Clean up
+    httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()

From a6ae8083895223429e45e2232bf2ca99f2037e8a Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Thu, 28 Mar 2024 09:29:39 -0400
Subject: [PATCH 07/15] Added additional integration tests for measure and add

---
 spoolman/database/spool.py                    |   9 +-
 tests_integration/tests/conftest.py           |   5 +-
 tests_integration/tests/spool/test_add.py     | 142 ++++++++++++++++++
 tests_integration/tests/spool/test_measure.py |  53 +++++++
 4 files changed, 204 insertions(+), 5 deletions(-)

diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index 2b32245..26022b2 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -368,12 +368,13 @@ async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spoo
         if initial_weight is None:
             initial_weight = filament_info[0] + empty_weight
 
-    # if the measurement is greater than the initial weight, raise an error
-    if weight > initial_weight:
-        raise SpoolMeasureError("Measured weight is greater than the initial weight of the spool.")
-
     # Calculate the current gross weight (initial_weight - used_weight)
     current_use = initial_weight - spool_info[1]
+
+    # if the measurement is greater than the initial weight, raise an error
+    if weight > current_use:
+        raise SpoolMeasureError("Measured weight cannot increase.")
+
     # Calculate the weight used since last measure
     weight_to_use = current_use - weight
 
diff --git a/tests_integration/tests/conftest.py b/tests_integration/tests/conftest.py
index 0bb259f..b3b074c 100644
--- a/tests_integration/tests/conftest.py
+++ b/tests_integration/tests/conftest.py
@@ -58,7 +58,10 @@ def random_vendor_impl():
     # Add vendor
     result = httpx.post(
         f"{URL}/api/v1/vendor",
-        json={"name": "John"},
+        json={
+            "name": "John",
+            "empty_spool_weight": 246,
+        },
     )
     result.raise_for_status()
 
diff --git a/tests_integration/tests/spool/test_add.py b/tests_integration/tests/spool/test_add.py
index d87fe5d..ed44fa5 100644
--- a/tests_integration/tests/spool/test_add.py
+++ b/tests_integration/tests/spool/test_add.py
@@ -195,3 +195,145 @@ def test_add_spool_both_used_and_remaining_weight(random_filament: dict[str, Any
         },
     )
     assert result.status_code == 400  # Cannot set both used and remaining weight
+
+
+def test_add_spool_initial_weight(random_filament: dict[str, Any]):
+    """Test adding a spool to the database."""
+    # Execute
+    remaining_weight = 750
+    initial_weight = 1245
+    location = "The Pantry"
+    lot_nr = "123456789"
+    comment = "abcdefghåäö"
+    archived = True
+    price = 25
+    result = httpx.post(
+        f"{URL}/api/v1/spool",
+        json={
+            "first_used": "2023-01-02T12:00:00+01:00",
+            "last_used": "2023-01-02T11:00:00Z",
+            "filament_id": random_filament["id"],
+            "remaining_weight": remaining_weight,
+            "initial_weight": initial_weight,
+            "location": location,
+            "lot_nr": lot_nr,
+            "comment": comment,
+            "archived": archived,
+            "price": price,
+        },
+    )
+    result.raise_for_status()
+
+    # Verify
+    used_weight = initial_weight - random_filament["spool_weight"] - remaining_weight
+    used_length = length_from_weight(
+        weight=used_weight,
+        density=random_filament["density"],
+        diameter=random_filament["diameter"],
+    )
+    remaining_length = length_from_weight(
+        weight=remaining_weight,
+        density=random_filament["density"],
+        diameter=random_filament["diameter"],
+    )
+
+    spool = result.json()
+    assert_dicts_compatible(
+        spool,
+        {
+            "id": spool["id"],
+            "registered": spool["registered"],
+            "first_used": "2023-01-02T11:00:00Z",
+            "last_used": "2023-01-02T11:00:00Z",
+            "filament": random_filament,
+            "initial_weight": pytest.approx(initial_weight),
+            "empty_weight": pytest.approx(random_filament["spool_weight"]),
+            "remaining_weight": pytest.approx(remaining_weight),
+            "used_weight": pytest.approx(used_weight),
+            "remaining_length": pytest.approx(remaining_length),
+            "used_length": pytest.approx(used_length),
+            "location": location,
+            "lot_nr": lot_nr,
+            "comment": comment,
+            "archived": archived,
+            "price": price,
+        },
+    )
+
+    # Verify that registered happened almost now (within 1 minute)
+    diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["registered"])).total_seconds())
+    assert diff < 60
+
+    # Clean up
+    httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
+
+
+def test_add_spool_empty_weight(random_filament: dict[str, Any]):
+    """Test adding a spool to the database."""
+    # Execute
+    remaining_weight = 750
+    empty_weight = 200
+    location = "The Pantry"
+    lot_nr = "123456789"
+    comment = "abcdefghåäö"
+    archived = True
+    price = 25
+    result = httpx.post(
+        f"{URL}/api/v1/spool",
+        json={
+            "first_used": "2023-01-02T12:00:00+01:00",
+            "last_used": "2023-01-02T11:00:00Z",
+            "filament_id": random_filament["id"],
+            "remaining_weight": remaining_weight,
+            "empty_weight": empty_weight,
+            "location": location,
+            "lot_nr": lot_nr,
+            "comment": comment,
+            "archived": archived,
+            "price": price,
+        },
+    )
+    result.raise_for_status()
+
+    # Verify
+    used_weight = random_filament["weight"] - remaining_weight
+    used_length = length_from_weight(
+        weight=used_weight,
+        density=random_filament["density"],
+        diameter=random_filament["diameter"],
+    )
+    remaining_length = length_from_weight(
+        weight=remaining_weight,
+        density=random_filament["density"],
+        diameter=random_filament["diameter"],
+    )
+
+    spool = result.json()
+    assert_dicts_compatible(
+        spool,
+        {
+            "id": spool["id"],
+            "registered": spool["registered"],
+            "first_used": "2023-01-02T11:00:00Z",
+            "last_used": "2023-01-02T11:00:00Z",
+            "filament": random_filament,
+            "initial_weight": pytest.approx(random_filament["weight"] + empty_weight),
+            "empty_weight": pytest.approx(empty_weight),
+            "remaining_weight": pytest.approx(remaining_weight),
+            "used_weight": pytest.approx(used_weight),
+            "remaining_length": pytest.approx(remaining_length),
+            "used_length": pytest.approx(used_length),
+            "location": location,
+            "lot_nr": lot_nr,
+            "comment": comment,
+            "archived": archived,
+            "price": price,
+        },
+    )
+
+    # Verify that registered happened almost now (within 1 minute)
+    diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["registered"])).total_seconds())
+    assert diff < 60
+
+    # Clean up
+    httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
diff --git a/tests_integration/tests/spool/test_measure.py b/tests_integration/tests/spool/test_measure.py
index 249d98c..c02f25a 100644
--- a/tests_integration/tests/spool/test_measure.py
+++ b/tests_integration/tests/spool/test_measure.py
@@ -89,3 +89,56 @@ def test_measure_spool_invalid(random_filament: dict[str, Any], measurement: flo
 
     # Clean up
     httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
+
+
+@pytest.mark.parametrize("measurements", [[1244, 1233, 1200], [1000, 900, 800], [1000, 1000, 1000]])
+def test_measure_spool_sequence(random_filament: dict[str, Any], measurements: list[float]):
+    """Test using a spool in the database."""
+    # Setup
+    random_filament["weight"]
+    initial_weight = 1255
+    current_weight = initial_weight
+    empty_weight = 246
+    start_weight = 1000
+    result = httpx.post(
+        f"{URL}/api/v1/spool",
+        json={
+            "filament_id": random_filament["id"],
+            "remaining_weight": start_weight,
+            "initial_weight": initial_weight,
+            "empty_weight": empty_weight,
+        },
+    )
+    result.raise_for_status()
+    spool = result.json()
+
+    for m in measurements:
+        # Execute
+        result = httpx.put(
+            f"{URL}/api/v1/spool/{spool['id']}/measure",
+            json={
+                "weight": m,
+            },
+        )
+        result.raise_for_status()
+
+        # Verify
+        spool = result.json()
+        # remaining_weight should be clamped so it's never negative,
+        # but used_weight should not be clamped to the net weight
+        expected_use = min(initial_weight - m, initial_weight - empty_weight)
+        assert spool["used_weight"] == pytest.approx(expected_use)
+        expected_remaining = max(m - empty_weight, 0)
+        assert spool["remaining_weight"] == pytest.approx(expected_remaining)
+        # Verify that first_used has been updated
+        diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["first_used"])).total_seconds())
+        assert diff < 60
+
+        # Verify that last_used has been updated
+        diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["last_used"])).total_seconds())
+        assert diff < 60
+
+        current_weight = current_weight - expected_use
+
+    # Clean up
+    httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()

From 951592ab4c01e027abd65962a7ebddb16e201135 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Thu, 28 Mar 2024 09:38:24 -0400
Subject: [PATCH 08/15] Add more integration tests for spool weights

---
 tests_integration/tests/spool/test_get.py    | 89 ++++++++++++++++++++
 tests_integration/tests/spool/test_update.py | 77 +++++++++++++++++
 2 files changed, 166 insertions(+)

diff --git a/tests_integration/tests/spool/test_get.py b/tests_integration/tests/spool/test_get.py
index 6a823be..f75eee3 100644
--- a/tests_integration/tests/spool/test_get.py
+++ b/tests_integration/tests/spool/test_get.py
@@ -3,6 +3,7 @@
 from typing import Any
 
 import httpx
+import pytest
 
 from ..conftest import URL
 
@@ -46,6 +47,94 @@ def test_get_spool(random_filament: dict[str, Any]):
     httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
 
 
+def test_get_spool_default_weights(random_filament: dict[str, Any]):
+    """Test getting a spool from the database."""
+    # Setup
+    first_used = "2023-01-01T00:00:00"
+    last_used = "2023-01-02T00:00:00"
+    remaining_weight = 750
+    location = "The Pantry"
+    lot_nr = "123456789"
+    comment = "abcdefghåäö"
+    price = 25
+    archived = True
+    result = httpx.post(
+        f"{URL}/api/v1/spool",
+        json={
+            "first_used": first_used,
+            "last_used": last_used,
+            "filament_id": random_filament["id"],
+            "remaining_weight": remaining_weight,
+            "location": location,
+            "lot_nr": lot_nr,
+            "comment": comment,
+            "price": price,
+            "archived": archived,
+        },
+    )
+    result.raise_for_status()
+    spool = result.json()
+
+    # Execute
+    result = httpx.get(f"{URL}/api/v1/spool/{spool['id']}")
+    result.raise_for_status()
+
+    result_spool = result.json()
+
+    # Verify
+    assert result_spool == spool
+    assert result_spool["initial_weight"] == pytest.approx(random_filament["weight"] + random_filament["spool_weight"])
+    assert result_spool["empty_weight"] == pytest.approx(random_filament["spool_weight"])
+
+    # Clean up
+    httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
+
+
+def test_get_spool_weights(random_filament: dict[str, Any]):
+    """Test getting a spool from the database."""
+    # Setup
+    first_used = "2023-01-01T00:00:00"
+    last_used = "2023-01-02T00:00:00"
+    remaining_weight = 750
+    initial_weight = 1255
+    empty_weight = 246
+    location = "The Pantry"
+    lot_nr = "123456789"
+    comment = "abcdefghåäö"
+    price = 25
+    archived = True
+    result = httpx.post(
+        f"{URL}/api/v1/spool",
+        json={
+            "first_used": first_used,
+            "last_used": last_used,
+            "filament_id": random_filament["id"],
+            "remaining_weight": remaining_weight,
+            "initial_weight": initial_weight,
+            "empty_weight": empty_weight,
+            "location": location,
+            "lot_nr": lot_nr,
+            "comment": comment,
+            "price": price,
+            "archived": archived,
+        },
+    )
+    result.raise_for_status()
+    spool = result.json()
+
+    # Execute
+    result = httpx.get(f"{URL}/api/v1/spool/{spool['id']}")
+    result.raise_for_status()
+
+    result_spool = result.json()
+
+    # Verify
+    assert result_spool == spool
+
+    # Clean up
+    httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
+
+
 def test_get_spool_not_found():
     """Test getting a spool that does not exist."""
     # Execute
diff --git a/tests_integration/tests/spool/test_update.py b/tests_integration/tests/spool/test_update.py
index 33577e9..6822454 100644
--- a/tests_integration/tests/spool/test_update.py
+++ b/tests_integration/tests/spool/test_update.py
@@ -77,6 +77,83 @@ def test_update_spool(random_filament: dict[str, Any]):
     httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
 
 
+def test_update_spool_weights(random_filament: dict[str, Any]):
+    """Test updating a spool in the database."""
+    # Setup
+    result = httpx.post(
+        f"{URL}/api/v1/spool",
+        json={
+            "filament_id": random_filament["id"],
+            "remaining_weight": 1000,
+            "initial_weight": 1255,
+            "empty_weight": 246,
+            "location": "The Pantry",
+            "lot_nr": "123456789",
+        },
+    )
+    result.raise_for_status()
+    spool = result.json()
+
+    # Execute
+    first_used = "2023-01-01T12:00:00+02:00"
+    last_used = "2023-01-02T12:00:00+02:00"
+    remaining_weight = 750
+    initial_weight = 1250
+    empty_weight = 245
+    location = "Living Room"
+    lot_nr = "987654321"
+    comment = "abcdefghåäö"
+    archived = True
+    price = 25
+    result = httpx.patch(
+        f"{URL}/api/v1/spool/{spool['id']}",
+        json={
+            "first_used": first_used,
+            "last_used": last_used,
+            "remaining_weight": remaining_weight,
+            "location": location,
+            "lot_nr": lot_nr,
+            "comment": comment,
+            "archived": archived,
+            "price": price,
+            "initial_weight": initial_weight,
+            "empty_weight": empty_weight,
+        },
+    )
+    result.raise_for_status()
+
+    # Verify
+    used_weight = initial_weight - empty_weight - remaining_weight
+    used_length = length_from_weight(
+        weight=used_weight,
+        density=random_filament["density"],
+        diameter=random_filament["diameter"],
+    )
+    remaining_length = length_from_weight(
+        weight=remaining_weight,
+        density=random_filament["density"],
+        diameter=random_filament["diameter"],
+    )
+
+    spool = result.json()
+    assert spool["first_used"] == "2023-01-01T10:00:00Z"
+    assert spool["last_used"] == "2023-01-02T10:00:00Z"
+    assert spool["initial_weight"] == pytest.approx(initial_weight)
+    assert spool["empty_weight"] == pytest.approx(empty_weight)
+    assert spool["remaining_weight"] == pytest.approx(remaining_weight)
+    assert spool["used_weight"] == pytest.approx(used_weight)
+    assert spool["remaining_length"] == pytest.approx(remaining_length)
+    assert spool["used_length"] == pytest.approx(used_length)
+    assert spool["location"] == location
+    assert spool["lot_nr"] == lot_nr
+    assert spool["comment"] == comment
+    assert spool["archived"] == archived
+    assert spool["price"] == price
+
+    # Clean up
+    httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
+
+
 def test_update_spool_both_used_and_remaining_weight(random_filament: dict[str, Any]):
     """Test updating a spool in the database."""
     # Setup

From 90795fea849d425d9cbb16728f975cd1486e1ef3 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Mon, 1 Apr 2024 11:41:13 -0400
Subject: [PATCH 09/15] Add libffi-dev to python-builder

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 77fb47d..f438449 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:3.11-alpine as python-builder
 
-RUN apk add --no-cache g++ python3-dev libpq-dev libstdc++ shadow
+RUN apk add --no-cache g++ python3-dev libpq-dev libstdc++ shadow libffi-dev
 
 # Add local user so we don't run as root
 RUN groupmod -g 1000 users \

From 37804c14a803d75d3f8d24557588ffd66525a0c6 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Mon, 8 Apr 2024 09:27:15 -0400
Subject: [PATCH 10/15] modified default settings

---
 spoolman/database/spool.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index 26022b2..849fea3 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -50,12 +50,13 @@ async def create(
     """Add a new spool to the database. Leave weight empty to assume full spool."""
     filament_item = await filament.get_by_id(db, filament_id)
 
-    if empty_weight is None:
-        empty_weight = filament_item.spool_weight if filament_item.spool_weight is not None else 0
+    # Set empty_weight to spool_weight if spool_weight is not null and empty_weight not provided
+    if empty_weight is None and filament_item.spool_weight is not None:
+        empty_weight = filament_item.spool_weight
 
     # Calculate initial_weight if not provided
-    if initial_weight is None:
-        initial_weight = (filament_item.weight if filament_item.weight is not None else 0) + empty_weight
+    if initial_weight is None and filament_item.weight is not None:
+        initial_weight = filament_item.weight - (empty_weight if empty_weight is not None else 0)
 
     if used_weight is None:
         if remaining_weight is not None:

From 23cfb42ba8a88e6e97576815733f56079527a3c5 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Mon, 8 Apr 2024 17:38:18 -0400
Subject: [PATCH 11/15] Updated based on PR requests

---
 spoolman/api/v1/spool.py                      |  6 +--
 spoolman/api/v1/vendor.py                     |  2 +-
 spoolman/database/spool.py                    | 19 ++++---
 tests_integration/tests/spool/test_measure.py | 52 +++++++++++++++++++
 4 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/spoolman/api/v1/spool.py b/spoolman/api/v1/spool.py
index 8bec54c..e133df2 100644
--- a/spoolman/api/v1/spool.py
+++ b/spoolman/api/v1/spool.py
@@ -42,12 +42,12 @@ class SpoolParameters(BaseModel):
     )
     initial_weight: Optional[float] = Field(
         ge=0,
-        description="The initial total weight of the filament and spool. (gross weight)",
+        description="The initial total weight of the filament and spool, in g. (gross weight)",
         example=200,
     )
     empty_weight: Optional[float] = Field(
         ge=0,
-        description="The weight of an empty spool. (tare weight)",
+        description="The weight of an empty spool, in g. (tare weight)",
         example=200,
     )
     remaining_weight: Optional[float] = Field(
@@ -86,7 +86,7 @@ class SpoolUseParameters(BaseModel):
 
 
 class SpoolMeasureParameters(BaseModel):
-    weight: float = Field(description="Current gross weight of the spool.", example=200)
+    weight: float = Field(description="Current gross weight of the spool, in g.", example=200)
 
 
 @router.get(
diff --git a/spoolman/api/v1/vendor.py b/spoolman/api/v1/vendor.py
index a7fad79..7803c46 100644
--- a/spoolman/api/v1/vendor.py
+++ b/spoolman/api/v1/vendor.py
@@ -35,7 +35,7 @@ class VendorParameters(BaseModel):
     )
     empty_spool_weight: Optional[float] = Field(
         ge=0,
-        description="The weight of an empty spool.",
+        description="The weight of an empty spool, in g.",
         example=200,
     )
     extra: Optional[dict[str, str]] = Field(
diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index 849fea3..a6919fa 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -56,12 +56,15 @@ async def create(
 
     # Calculate initial_weight if not provided
     if initial_weight is None and filament_item.weight is not None:
-        initial_weight = filament_item.weight - (empty_weight if empty_weight is not None else 0)
+        initial_weight = filament_item.weight + (empty_weight if empty_weight is not None else 0)
 
     if used_weight is None:
         if remaining_weight is not None:
             if initial_weight is None or initial_weight == 0:
-                raise ItemCreateError("remaining_weight can only be used if the initial_weight is defined.")
+                raise ItemCreateError(
+                    "remaining_weight can only be used if the initial_weight is "
+                    "defined or the filament has a weight set.",
+                )
             used_weight = max(initial_weight - empty_weight - remaining_weight, 0)
         else:
             used_weight = 0
@@ -352,7 +355,7 @@ async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spoo
 
     initial_weight = spool_info[0]
     empty_weight = spool_info[2]
-    if initial_weight is None or empty_weight is None:
+    if initial_weight is None or initial_weight == 0 or empty_weight is None or empty_weight == 0:
         # Get filament weight and spool_weight
         result = await db.execute(
             sqlalchemy.select(models.Filament.weight, models.Filament.spool_weight)
@@ -363,11 +366,15 @@ async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spoo
             filament_info = result.one()
         except NoResultFound as exc:
             raise ItemNotFoundError("Filament not found for spool.") from exc
-        if empty_weight is None:
+
+        if empty_weight is None or empty_weight == 0:
             empty_weight = filament_info[1]
 
-        if initial_weight is None:
-            initial_weight = filament_info[0] + empty_weight
+        if initial_weight is None or initial_weight == 0:
+            initial_weight = (filament_info[0] if filament_info[0] is not None else 0) + empty_weight
+
+    if initial_weight is None or initial_weight == 0:
+        raise SpoolMeasureError("Initial weight is not set.")
 
     # Calculate the current gross weight (initial_weight - used_weight)
     current_use = initial_weight - spool_info[1]
diff --git a/tests_integration/tests/spool/test_measure.py b/tests_integration/tests/spool/test_measure.py
index c02f25a..13e3552 100644
--- a/tests_integration/tests/spool/test_measure.py
+++ b/tests_integration/tests/spool/test_measure.py
@@ -142,3 +142,55 @@ def test_measure_spool_sequence(random_filament: dict[str, Any], measurements: l
 
     # Clean up
     httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
+
+
+@pytest.mark.parametrize("measurements", [[1244, 1233, 1200], [1000, 900, 800], [1000, 1000, 1000]])
+def test_measure_spool_empty(random_empty_filament: dict[str, Any], measurements: list[float]):
+    """Test using a spool in the database."""
+    # Setup
+    initial_weight = 1255
+    current_weight = initial_weight
+    empty_weight = 246
+    start_weight = 1000
+    result = httpx.post(
+        f"{URL}/api/v1/spool",
+        json={
+            "filament_id": random_empty_filament["id"],
+            "remaining_weight": start_weight,
+            "initial_weight": initial_weight,
+            "empty_weight": empty_weight,
+        },
+    )
+    result.raise_for_status()
+    spool = result.json()
+
+    for m in measurements:
+        # Execute
+        result = httpx.put(
+            f"{URL}/api/v1/spool/{spool['id']}/measure",
+            json={
+                "weight": m,
+            },
+        )
+        result.raise_for_status()
+
+        # Verify
+        spool = result.json()
+        # remaining_weight should be clamped so it's never negative,
+        # but used_weight should not be clamped to the net weight
+        expected_use = min(initial_weight - m, initial_weight - empty_weight)
+        assert spool["used_weight"] == pytest.approx(expected_use)
+        expected_remaining = max(m - empty_weight, 0)
+        assert spool["remaining_weight"] == pytest.approx(expected_remaining)
+        # Verify that first_used has been updated
+        diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["first_used"])).total_seconds())
+        assert diff < 60
+
+        # Verify that last_used has been updated
+        diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["last_used"])).total_seconds())
+        assert diff < 60
+
+        current_weight = current_weight - expected_use
+
+    # Clean up
+    httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()

From dad446621fde2f4e89c8efef5ed543af966d0bdc Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Mon, 8 Apr 2024 17:40:22 -0400
Subject: [PATCH 12/15] Changed g to grams in API docs for clarity

---
 spoolman/api/v1/spool.py  | 4 ++--
 spoolman/api/v1/vendor.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spoolman/api/v1/spool.py b/spoolman/api/v1/spool.py
index e133df2..fcf801d 100644
--- a/spoolman/api/v1/spool.py
+++ b/spoolman/api/v1/spool.py
@@ -42,12 +42,12 @@ class SpoolParameters(BaseModel):
     )
     initial_weight: Optional[float] = Field(
         ge=0,
-        description="The initial total weight of the filament and spool, in g. (gross weight)",
+        description="The initial total weight of the filament and spool, in grams. (gross weight)",
         example=200,
     )
     empty_weight: Optional[float] = Field(
         ge=0,
-        description="The weight of an empty spool, in g. (tare weight)",
+        description="The weight of an empty spool, in grams. (tare weight)",
         example=200,
     )
     remaining_weight: Optional[float] = Field(
diff --git a/spoolman/api/v1/vendor.py b/spoolman/api/v1/vendor.py
index 7803c46..d6efdc3 100644
--- a/spoolman/api/v1/vendor.py
+++ b/spoolman/api/v1/vendor.py
@@ -35,7 +35,7 @@ class VendorParameters(BaseModel):
     )
     empty_spool_weight: Optional[float] = Field(
         ge=0,
-        description="The weight of an empty spool, in g.",
+        description="The weight of an empty spool, in grams.",
         example=200,
     )
     extra: Optional[dict[str, str]] = Field(

From c6f9abecedef005ff3d8f28cce4ff86eb6a1d2fb Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Wed, 10 Apr 2024 11:00:46 -0400
Subject: [PATCH 13/15] Changed initial_weight to be net weight, not gross
 weight

---
 client/public/locales/en/common.json          |   6 +-
 client/src/pages/spools/create.tsx            | 111 ++++++++----------
 client/src/pages/spools/edit.tsx              |  83 +++++--------
 client/src/pages/spools/model.tsx             |   2 +-
 ...4_03_26_0948-aafcd7fb0e84_spool_weights.py |   6 +-
 ...49-304a32906234_spool_weight_population.py |   8 +-
 spoolman/api/v1/models.py                     |  10 +-
 spoolman/api/v1/spool.py                      |   6 +-
 spoolman/database/models.py                   |   2 +-
 spoolman/database/spool.py                    |  44 +++----
 tests_integration/tests/spool/test_add.py     |  16 +--
 tests_integration/tests/spool/test_get.py     |   8 +-
 tests_integration/tests/spool/test_measure.py |  48 ++++----
 tests_integration/tests/spool/test_update.py  |  12 +-
 14 files changed, 159 insertions(+), 203 deletions(-)

diff --git a/client/public/locales/en/common.json b/client/public/locales/en/common.json
index 368846c..39b1ed0 100644
--- a/client/public/locales/en/common.json
+++ b/client/public/locales/en/common.json
@@ -145,7 +145,7 @@
             "used_length": "Used Length",
             "remaining_length": "Remaining Length",
             "initial_weight": "Initial Weight",
-            "empty_weight": "Empty Weight",
+            "spool_weight": "Empty Weight",
             "location": "Location",
             "lot_nr": "Lot Nr",
             "first_used": "First Used",
@@ -160,8 +160,8 @@
             "used_weight": "How much filament has been used from the spool. A new spool should have 0g used.",
             "remaining_weight": "How much filament is left on the spool. For a new spool this should match the spool weight.",
             "measured_weight": "How much the filament and spool weigh.",
-            "initial_weight": "The initial Total Weight of the filament and spool.",
-            "empty_weight": "The weight of the spool when it is empty.",
+            "initial_weight": "The initial Weight of the filament (net weight)",
+            "spool_weight": "The weight of the spool when it is empty.",
             "location": "Where the spool is located if you have multiple locations where you store your spools.",
             "lot_nr": "Manufacturer's lot number. Can be used to ensure a print has consistent color if multiple spools are used."
         },
diff --git a/client/src/pages/spools/create.tsx b/client/src/pages/spools/create.tsx
index e60b71c..21d75de 100644
--- a/client/src/pages/spools/create.tsx
+++ b/client/src/pages/spools/create.tsx
@@ -5,7 +5,7 @@ import { Form, Input, DatePicker, Select, InputNumber, Radio, Divider, Button, T
 import dayjs from "dayjs";
 import TextArea from "antd/es/input/TextArea";
 import { IFilament } from "../filaments/model";
-import { ISpool, ISpoolParsedExtras } from "./model";
+import { ISpool, ISpoolParsedExtras, WeightToEnter } from "./model";
 import { numberFormatter, numberParser } from "../../utils/parsing";
 import { useSpoolmanLocations } from "../../components/otherModels";
 import { MinusOutlined, PlusOutlined } from "@ant-design/icons";
@@ -14,6 +14,7 @@ import { EntityType, useGetFields } from "../../utils/queryFields";
 import { ExtraFieldFormItem, StringifiedExtras } from "../../components/extraFields";
 import utc from "dayjs/plugin/utc";
 import { getCurrencySymbol, useCurrency } from "../../utils/settings";
+import { ValueType } from "rc-input-number";
 
 dayjs.extend(utc);
 
@@ -39,6 +40,9 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
     formProps.initialValues = {};
   }
 
+  const initialWeightValue = Form.useWatch("initial_weight", form);
+  const spoolWeightValue = Form.useWatch("spool_weight", form);
+
   if (props.mode === "clone") {
     // Clear out the values that we don't want to clone
     formProps.initialValues.first_used = null;
@@ -121,19 +125,19 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
       return obj.value === newID;
     });
 
-    const initial_weight = form.getFieldValue("initial_weight") as number ?? 0;
-    const empty_weight = form.getFieldValue("empty_weight") as number ?? 0;
+    const initial_weight = initialWeightValue ?? 0;
+    const spool_weight = spoolWeightValue ?? 0;
     
     const newFilamentWeight = newSelectedFilament?.weight || 0;
     const newSpoolWeight = newSelectedFilament?.spool_weight || 0;
 
     const currentCalculatedFilamentWeight = getTotalWeightFromFilament();
     if ((initial_weight === 0 || initial_weight === currentCalculatedFilamentWeight) && newFilamentWeight > 0) {
-      form.setFieldValue("initial_weight", newFilamentWeight + newSpoolWeight);
+      form.setFieldValue("initial_weight", newFilamentWeight);
     }
 
-    if ((empty_weight === 0 || empty_weight === (selectedFilament?.spool_weight ?? 0)) && newSpoolWeight > 0) {
-      form.setFieldValue("empty_weight", newSpoolWeight);
+    if ((spool_weight === 0 || spool_weight === (selectedFilament?.spool_weight ?? 0)) && newSpoolWeight > 0) {
+      form.setFieldValue("spool_weight", newSpoolWeight);
     }
   };
 
@@ -161,57 +165,34 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
     setQuantity(quantity - 1);
   };
 
-  const getSpoolTotalWeight = (): number => {
-    const initial_weight = form.getFieldValue("initial_weight") as number;
-    const empty_weight = form.getFieldValue("empty_weight") as number;
-    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
-    return initial_weight ?? (selectedFilament?.weight ?? 0) + spool_weight;
+  const getSpoolWeight = (): number => {
+    return spoolWeightValue ?? (selectedFilament?.spool_weight ?? 0);
+  }
+
+  const getFilamentWeight = (): number => {
+    return initialWeightValue ?? (selectedFilament?.weight ?? 0)
+  }
+
+  const getGrossWeight = (): number => {
+    const net_weight = getFilamentWeight();
+    const spool_weight = getSpoolWeight();
+    return net_weight + spool_weight;
   };
 
   const getTotalWeightFromFilament = (): number => {
     return (selectedFilament?.weight ?? 0) + (selectedFilament?.spool_weight ?? 0);
   }
 
-  const getFilamentWeight = (): number => {
-    const initial_weight = form.getFieldValue("initial_weight") as number;
-    const empty_weight = form.getFieldValue("empty_weight") as number;
-    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
-    if (initial_weight) {
-      return initial_weight - (spool_weight ?? 0);
-    }
-    return selectedFilament?.weight ?? 0;
-  }
-
   const getMeasuredWeight = (): number => {
-    const initial_weight = form.getFieldValue("initial_weight") as number;
+    const grossWeight = getGrossWeight();
 
-    if (initial_weight) {
-      return initial_weight - usedWeight;
-    }
-    const empty_weight = form.getFieldValue("empty_weight") as number;
-    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
-
-    if (selectedFilament?.weight && spool_weight) {
-      return selectedFilament?.weight - usedWeight + spool_weight;
-    }
-    return 0;
+    return grossWeight - usedWeight;
   }
 
   const getRemainingWeight = (): number => {
-    const initial_weight = form.getFieldValue("initial_weight") as number ?? 0;
-    const empty_weight = form.getFieldValue("empty_weight") as number;
-    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
+    const initial_weight = getFilamentWeight();
 
-    let remaining_weight = 0;
-
-    if (initial_weight === 0) {
-      remaining_weight = (selectedFilament?.weight ?? 0) - usedWeight;
-    }
-    else {
-      remaining_weight = initial_weight - spool_weight - usedWeight;
-    }
-    
-    return (remaining_weight >= 0) ? remaining_weight : 0;
+    return initial_weight - usedWeight;
   }
 
   const isMeasuredWeightEnabled = (): boolean => {
@@ -220,13 +201,13 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
       return false;
     }
 
-    const empty_weight = form.getFieldValue("empty_weight") as number;
+    const spool_weight = spoolWeightValue;
 
-    return (empty_weight || selectedFilament?.spool_weight) ? true : false;
+    return (spool_weight || selectedFilament?.spool_weight) ? true : false;
   }
   
   const isRemainingWeightEnabled = (): boolean => {
-    const initial_weight = form.getFieldValue("initial_weight") as number;
+    const initial_weight = initialWeightValue;
 
     if (initial_weight) {
       return true;
@@ -236,21 +217,21 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
   }
 
   React.useEffect(() => {
-    if (weightToEnter >= 3) 
+    if (weightToEnter >= WeightToEnter.measured_weight) 
     {
       if (!isMeasuredWeightEnabled()) {
-        setWeightToEnter(2);
+        setWeightToEnter(WeightToEnter.remaining_weight);
         return;
       }
     }
-    if (weightToEnter >= 2)
+    if (weightToEnter >= WeightToEnter.remaining_weight)
     {
       if (!isRemainingWeightEnabled()) {
-        setWeightToEnter(1);
+        setWeightToEnter(WeightToEnter.used_weight);
         return;
       }
     }
-  }, [selectedFilament, weightChange])
+  }, [selectedFilament])
 
 
   return (
@@ -359,13 +340,13 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             },
           ]}
         >
-          <InputNumber addonAfter="g" precision={1}/>
+          <InputNumber addonAfter="g" precision={1} />
         </Form.Item>
 
         <Form.Item
-          label={t("spool.fields.empty_weight")}
-          help={t("spool.fields_help.empty_weight")}
-          name={["empty_weight"]}
+          label={t("spool.fields.spool_weight")}
+          help={t("spool.fields_help.spool_weight")}
+          name={["spool_weight"]}
           rules={[
             {
               required: false,
@@ -386,14 +367,14 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             onChange={(value) => {
               setWeightToEnter(value.target.value);
             }}
-            defaultValue={1}
+            defaultValue={WeightToEnter.used_weight}
             value={weightToEnter}
           >
-            <Radio.Button value={1}>{t("spool.fields.used_weight")}</Radio.Button>
-            <Radio.Button value={2} disabled={!isRemainingWeightEnabled()}>
+            <Radio.Button value={WeightToEnter.used_weight}>{t("spool.fields.used_weight")}</Radio.Button>
+            <Radio.Button value={WeightToEnter.remaining_weight} disabled={!isRemainingWeightEnabled()}>
               {t("spool.fields.remaining_weight")}
             </Radio.Button>
-            <Radio.Button value={3} disabled={!isMeasuredWeightEnabled()}>
+            <Radio.Button value={WeightToEnter.measured_weight} disabled={!isMeasuredWeightEnabled()}>
               {t("spool.fields.measured_weight")}
             </Radio.Button>
           </Radio.Group>
@@ -406,7 +387,7 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             precision={1}
             formatter={numberFormatter}
             parser={numberParser}
-            disabled={weightToEnter != 1}
+            disabled={weightToEnter != WeightToEnter.used_weight}
             value={usedWeight}
             onChange={(value) => {
               weightChange(value ?? 0);
@@ -424,7 +405,7 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             precision={1}
             formatter={numberFormatter}
             parser={numberParser}
-            disabled={weightToEnter != 2}
+            disabled={weightToEnter != WeightToEnter.remaining_weight}
             value={getRemainingWeight()}
             onChange={(value) => {
               weightChange(getFilamentWeight() - (value ?? 0));
@@ -442,10 +423,10 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
             precision={1}
             formatter={numberFormatter}
             parser={numberParser}
-            disabled={weightToEnter != 3}
+            disabled={weightToEnter != WeightToEnter.measured_weight}
             value={getMeasuredWeight()}
             onChange={(value) => {
-              const totalWeight = getSpoolTotalWeight();
+              const totalWeight = getGrossWeight();
               weightChange(totalWeight - (value ?? 0));
             }}
           />
diff --git a/client/src/pages/spools/edit.tsx b/client/src/pages/spools/edit.tsx
index e118e97..cb5b9cb 100644
--- a/client/src/pages/spools/edit.tsx
+++ b/client/src/pages/spools/edit.tsx
@@ -37,6 +37,8 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
     },
   });
 
+  const initialWeightValue = Form.useWatch("initial_weight", form);
+  const spoolWeightValue = Form.useWatch("spool_weight", form);
   // Get filament selection options
   const { queryResult } = useSelect<IFilament>({
     resource: "filament",
@@ -101,19 +103,19 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
       return obj.value === newID;
     });
 
-    const initial_weight = form.getFieldValue("initial_weight") as number ?? 0;
-    const empty_weight = form.getFieldValue("empty_weight") as number ?? 0;
+    const initial_weight = initialWeightValue ?? 0;
+    const spool_weight = spoolWeightValue ?? 0;
     
     const newFilamentWeight = newSelectedFilament?.weight || 0;
     const newSpoolWeight = newSelectedFilament?.spool_weight || 0;
 
     const currentCalculatedFilamentWeight = getTotalWeightFromFilament();
     if ((initial_weight === 0 || initial_weight === currentCalculatedFilamentWeight) && newFilamentWeight > 0) {
-      form.setFieldValue("initial_weight", newFilamentWeight + newSpoolWeight);
+      form.setFieldValue("initial_weight", newFilamentWeight);
     }
 
-    if ((empty_weight === 0 || empty_weight === (selectedFilament?.spool_weight ?? 0)) && newSpoolWeight > 0) {
-      form.setFieldValue("empty_weight", newSpoolWeight);
+    if ((spool_weight === 0 || spool_weight === (selectedFilament?.spool_weight ?? 0)) && newSpoolWeight > 0) {
+      form.setFieldValue("spool_weight", newSpoolWeight);
     }
   };
 
@@ -132,57 +134,34 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
     allLocations.push(newLocation.trim());
   }
 
-  const getSpoolTotalWeight = (): number => {
-    const initial_weight = form.getFieldValue("initial_weight") as number;
-    const empty_weight = form.getFieldValue("empty_weight") as number;
-    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
-    return initial_weight ?? (selectedFilament?.weight ?? 0) + spool_weight;
+const getSpoolWeight = (): number => {
+    return spoolWeightValue ?? (selectedFilament?.spool_weight ?? 0);
+  }
+
+  const getFilamentWeight = (): number => {
+    return initialWeightValue ?? (selectedFilament?.weight ?? 0)
+  }
+
+  const getGrossWeight = (): number => {
+    const net_weight = getFilamentWeight();
+    const spool_weight = getSpoolWeight();
+    return net_weight + spool_weight;
   };
 
   const getTotalWeightFromFilament = (): number => {
     return (selectedFilament?.weight ?? 0) + (selectedFilament?.spool_weight ?? 0);
   }
 
-  const getFilamentWeight = (): number => {
-    const initial_weight = form.getFieldValue("initial_weight") as number;
-    const empty_weight = form.getFieldValue("empty_weight") as number;
-    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
-    if (initial_weight) {
-      return initial_weight - (spool_weight ?? 0);
-    }
-    return selectedFilament?.weight ?? 0;
-  }
-
   const getMeasuredWeight = (): number => {
-    const initial_weight = form.getFieldValue("initial_weight") as number;
+    const grossWeight = getGrossWeight();
 
-    if (initial_weight) {
-      return initial_weight - usedWeight;
-    }
-    const empty_weight = form.getFieldValue("empty_weight") as number;
-    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
-
-    if (selectedFilament?.weight && spool_weight) {
-      return selectedFilament?.weight - usedWeight + spool_weight;
-    }
-    return 0;
+    return grossWeight - usedWeight;
   }
 
   const getRemainingWeight = (): number => {
-    const initial_weight = form.getFieldValue("initial_weight") as number ?? 0;
-    const empty_weight = form.getFieldValue("empty_weight") as number;
-    const spool_weight = empty_weight ?? selectedFilament?.spool_weight;
+    const initial_weight = getFilamentWeight();
 
-    let remaining_weight = 0;
-
-    if (initial_weight === 0) {
-      remaining_weight = (selectedFilament?.weight ?? 0) - usedWeight;
-    }
-    else {
-      remaining_weight = initial_weight - spool_weight - usedWeight;
-    }
-    
-    return (remaining_weight >= 0) ? remaining_weight : 0;
+    return initial_weight - usedWeight;
   }
 
   const isMeasuredWeightEnabled = (): boolean => {
@@ -191,13 +170,13 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
       return false;
     }
 
-    const empty_weight = form.getFieldValue("empty_weight") as number;
+    const spool_weight = spoolWeightValue;
 
-    return (empty_weight || selectedFilament?.spool_weight) ? true : false;
+    return (spool_weight || selectedFilament?.spool_weight) ? true : false;
   }
   
   const isRemainingWeightEnabled = (): boolean => {
-    const initial_weight = form.getFieldValue("initial_weight") as number;
+    const initial_weight = initialWeightValue;
 
     if (initial_weight) {
       return true;
@@ -221,7 +200,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
         return;
       }
     }
-  }, [selectedFilament, weightChange])
+  }, [selectedFilament])
 
   const initialUsedWeight = formProps.initialValues?.used_weight || 0;
   useEffect(() => {
@@ -342,9 +321,9 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
         </Form.Item>
 
         <Form.Item
-          label={t("spool.fields.empty_weight")}
-          help={t("spool.fields_help.empty_weight")}
-          name={["empty_weight"]}
+          label={t("spool.fields.spool_weight")}
+          help={t("spool.fields_help.spool_weight")}
+          name={["spool_weight"]}
           rules={[
             {
               required: false,
@@ -421,7 +400,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
             disabled={weightToEnter != WeightToEnter.measured_weight}
             value={getMeasuredWeight()}
             onChange={(value) => {
-              const totalWeight = getSpoolTotalWeight();
+              const totalWeight = getGrossWeight();
               weightChange(totalWeight - (value ?? 0));
             }}
           />
diff --git a/client/src/pages/spools/model.tsx b/client/src/pages/spools/model.tsx
index 3e49b92..626afb2 100644
--- a/client/src/pages/spools/model.tsx
+++ b/client/src/pages/spools/model.tsx
@@ -14,7 +14,7 @@ export interface ISpool {
   filament: IFilament;
   price?: number;
   initial_weight?: number;
-  empty_weight?: number;
+  spool_weight?: number;
   remaining_weight?: number;
   used_weight: number;
   remaining_length?: number;
diff --git a/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py b/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py
index ec14929..aef58c5 100644
--- a/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py
+++ b/migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py
@@ -23,12 +23,12 @@ def upgrade() -> None:
             "initial_weight",
             sa.Float(),
             nullable=True,
-            comment="The initial total weight of the spool (gross weight).",
+            comment="The initial weight of the filament on the spool (net weight).",
         ),
     )
     op.add_column(
         "spool",
-        sa.Column("empty_weight", sa.Float(), nullable=True, comment="The weight of the empty spool (tare weight)."),
+        sa.Column("spool_weight", sa.Float(), nullable=True, comment="The weight of the empty spool (tare weight)."),
     )
     # ### end Alembic commands ###
 
@@ -36,6 +36,6 @@ def upgrade() -> None:
 def downgrade() -> None:
     """Perform the downgrade."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column("spool", "empty_weight")
+    op.drop_column("spool", "spool_weight")
     op.drop_column("spool", "initial_weight")
     # ### end Alembic commands ###
diff --git a/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py b/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
index fc30c42..1b061fd 100644
--- a/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
+++ b/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
@@ -37,7 +37,7 @@ def upgrade() -> None:
             nullable=False,
         ),
         sa.Column(
-            "empty_weight",
+            "spool_weight",
             sa.Float(),
             nullable=False,
         ),
@@ -48,13 +48,13 @@ def upgrade() -> None:
         .where(filament.c.id == spool.c.filament_id)
         .scalar_subquery()
     )
-    empty_weight = sa.select(filament.c.spool_weight).where(filament.c.id == spool.c.filament_id).scalar_subquery()
+    spool_weight = sa.select(filament.c.spool_weight).where(filament.c.id == spool.c.filament_id).scalar_subquery()
 
     set_initial_weight = sa.update(spool).values(initial_weight=initial_weight)
     op.execute(set_initial_weight)
 
-    set_empty_weight = sa.update(spool).values(empty_weight=empty_weight)
-    op.execute(set_empty_weight)
+    set_spool_weight = sa.update(spool).values(spool_weight=spool_weight)
+    op.execute(set_spool_weight)
     pass
 
 
diff --git a/spoolman/api/v1/models.py b/spoolman/api/v1/models.py
index 64d0b98..b983940 100644
--- a/spoolman/api/v1/models.py
+++ b/spoolman/api/v1/models.py
@@ -190,10 +190,10 @@ class Spool(BaseModel):
     initial_weight: Optional[float] = Field(
         default=None,
         ge=0,
-        description=("Initial weight of the filament and spool (gross weight)"),
+        description=("The initial weight, in grams, of the filament on the spool (net weight)."),
         example=1246,
     )
-    empty_weight: Optional[float] = Field(
+    spool_weight: Optional[float] = Field(
         default=None,
         ge=0,
         description=("Weight of an empty spool (tare weight)."),
@@ -242,9 +242,7 @@ class Spool(BaseModel):
         remaining_length: Optional[float] = None
 
         if item.initial_weight is not None:
-            filament_spool_weight = item.filament.spool_weight if item.filament.spool_weight is not None else 0
-            spool_weight = item.empty_weight if item.empty_weight is not None else filament_spool_weight
-            remaining_weight = max(item.initial_weight - spool_weight - item.used_weight, 0)
+            remaining_weight = max(item.initial_weight - item.used_weight, 0)
             remaining_length = length_from_weight(
                 weight=remaining_weight,
                 density=filament.density,
@@ -272,7 +270,7 @@ class Spool(BaseModel):
             filament=filament,
             price=item.price,
             initial_weight=item.initial_weight,
-            empty_weight=item.empty_weight,
+            spool_weight=item.spool_weight,
             used_weight=item.used_weight,
             used_length=used_length,
             remaining_weight=remaining_weight,
diff --git a/spoolman/api/v1/spool.py b/spoolman/api/v1/spool.py
index fcf801d..3ca7a15 100644
--- a/spoolman/api/v1/spool.py
+++ b/spoolman/api/v1/spool.py
@@ -42,10 +42,10 @@ class SpoolParameters(BaseModel):
     )
     initial_weight: Optional[float] = Field(
         ge=0,
-        description="The initial total weight of the filament and spool, in grams. (gross weight)",
+        description="The initial weight of the filament on the spool, in grams. (net weight)",
         example=200,
     )
-    empty_weight: Optional[float] = Field(
+    spool_weight: Optional[float] = Field(
         ge=0,
         description="The weight of an empty spool, in grams. (tare weight)",
         example=200,
@@ -369,7 +369,7 @@ async def create(  # noqa: ANN201
             filament_id=body.filament_id,
             price=body.price,
             initial_weight=body.initial_weight,
-            empty_weight=body.empty_weight,
+            spool_weight=body.spool_weight,
             remaining_weight=body.remaining_weight,
             used_weight=body.used_weight,
             first_used=body.first_used,
diff --git a/spoolman/database/models.py b/spoolman/database/models.py
index 1a2d5bd..7b91a3f 100644
--- a/spoolman/database/models.py
+++ b/spoolman/database/models.py
@@ -66,7 +66,7 @@ class Spool(Base):
     filament_id: Mapped[int] = mapped_column(ForeignKey("filament.id"))
     filament: Mapped["Filament"] = relationship(back_populates="spools")
     initial_weight: Mapped[Optional[float]] = mapped_column()
-    empty_weight: Mapped[Optional[float]] = mapped_column()
+    spool_weight: Mapped[Optional[float]] = mapped_column()
     used_weight: Mapped[float] = mapped_column()
     location: Mapped[Optional[str]] = mapped_column(String(64))
     lot_nr: Mapped[Optional[str]] = mapped_column(String(64))
diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index a6919fa..9805498 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -36,7 +36,7 @@ async def create(
     filament_id: int,
     remaining_weight: Optional[float] = None,
     initial_weight: Optional[float] = None,
-    empty_weight: Optional[float] = None,
+    spool_weight: Optional[float] = None,
     used_weight: Optional[float] = None,
     first_used: Optional[datetime] = None,
     last_used: Optional[datetime] = None,
@@ -50,13 +50,13 @@ async def create(
     """Add a new spool to the database. Leave weight empty to assume full spool."""
     filament_item = await filament.get_by_id(db, filament_id)
 
-    # Set empty_weight to spool_weight if spool_weight is not null and empty_weight not provided
-    if empty_weight is None and filament_item.spool_weight is not None:
-        empty_weight = filament_item.spool_weight
+    # Set spool_weight to spool_weight if spool_weight is not null and spool_weight not provided
+    if spool_weight is None and filament_item.spool_weight is not None:
+        spool_weight = filament_item.spool_weight
 
     # Calculate initial_weight if not provided
     if initial_weight is None and filament_item.weight is not None:
-        initial_weight = filament_item.weight + (empty_weight if empty_weight is not None else 0)
+        initial_weight = filament_item.weight
 
     if used_weight is None:
         if remaining_weight is not None:
@@ -65,7 +65,7 @@ async def create(
                     "remaining_weight can only be used if the initial_weight is "
                     "defined or the filament has a weight set.",
                 )
-            used_weight = max(initial_weight - empty_weight - remaining_weight, 0)
+            used_weight = max(initial_weight - remaining_weight, 0)
         else:
             used_weight = 0
 
@@ -79,7 +79,7 @@ async def create(
         filament=filament_item,
         registered=datetime.utcnow().replace(microsecond=0),
         initial_weight=initial_weight,
-        empty_weight=empty_weight,
+        spool_weight=spool_weight,
         used_weight=used_weight,
         price=price,
         first_used=first_used,
@@ -166,7 +166,7 @@ async def find(
         for fieldstr, order in sort_by.items():
             sorts = []
             if fieldstr in {"remaining_weight", "remaining_length"}:
-                sorts.append(models.Spool.initial_weight - models.Spool.empty_weight - models.Spool.used_weight)
+                sorts.append(models.Spool.initial_weight - models.Spool.spool_weight - models.Spool.used_weight)
             elif fieldstr == "filament.combined_name":
                 sorts.append(models.Vendor.name)
                 sorts.append(models.Filament.name)
@@ -198,15 +198,13 @@ async def update(
         if k == "filament_id":
             spool.filament = await filament.get_by_id(db, v)
             # If there is no initial_weight, calculate it from the filament weight
-            if spool.initial_weight is None and spool.empty_weight is None and spool.filament.weight is not None:
-                spool_weight = spool.empty_weight if spool.empty_weight is not None else 0
-                spool.initial_weight = spool.filament.weight + spool_weight
-                spool.empty_weight = spool_weight
+            if spool.initial_weight is None and spool.filament.weight is not None:
+                spool.initial_weight = spool.filament.weight
 
         elif k == "remaining_weight":
             if spool.initial_weight is None:
                 raise ItemCreateError("remaining_weight can only be used if initial_weight is set.")
-            spool.used_weight = max((spool.initial_weight - spool.empty_weight) - v, 0)
+            spool.used_weight = max(spool.initial_weight - v, 0)
         elif isinstance(v, datetime):
             setattr(spool, k, utc_timezone_naive(v))
         elif k == "extra":
@@ -343,7 +341,7 @@ async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spoo
 
     """
     spool_result = await db.execute(
-        sqlalchemy.select(models.Spool.initial_weight, models.Spool.used_weight, models.Spool.empty_weight).where(
+        sqlalchemy.select(models.Spool.initial_weight, models.Spool.used_weight, models.Spool.spool_weight).where(
             models.Spool.id == spool_id,
         ),
     )
@@ -354,8 +352,8 @@ async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spoo
         raise SpoolMeasureError("Spool not found.") from exc
 
     initial_weight = spool_info[0]
-    empty_weight = spool_info[2]
-    if initial_weight is None or initial_weight == 0 or empty_weight is None or empty_weight == 0:
+    spool_weight = spool_info[2]
+    if initial_weight is None or initial_weight == 0 or spool_weight is None or spool_weight == 0:
         # Get filament weight and spool_weight
         result = await db.execute(
             sqlalchemy.select(models.Filament.weight, models.Filament.spool_weight)
@@ -367,17 +365,19 @@ async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spoo
         except NoResultFound as exc:
             raise ItemNotFoundError("Filament not found for spool.") from exc
 
-        if empty_weight is None or empty_weight == 0:
-            empty_weight = filament_info[1]
+        if spool_weight is None or spool_weight == 0:
+            spool_weight = filament_info[1]
 
         if initial_weight is None or initial_weight == 0:
-            initial_weight = (filament_info[0] if filament_info[0] is not None else 0) + empty_weight
+            initial_weight = filament_info[0] if filament_info[0] is not None else 0
 
     if initial_weight is None or initial_weight == 0:
         raise SpoolMeasureError("Initial weight is not set.")
 
+    initial_gross_weight = initial_weight + spool_weight
+
     # Calculate the current gross weight (initial_weight - used_weight)
-    current_use = initial_weight - spool_info[1]
+    current_use = initial_gross_weight - spool_info[1]
 
     # if the measurement is greater than the initial weight, raise an error
     if weight > current_use:
@@ -387,8 +387,8 @@ async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spoo
     weight_to_use = current_use - weight
 
     # If the measured weight is less than the empty weight, use the rest of the spool
-    if (initial_weight - weight_to_use) < empty_weight:
-        weight_to_use = current_use - empty_weight
+    if (initial_gross_weight - weight_to_use) < spool_weight:
+        weight_to_use = current_use - spool_weight
 
     return await use_weight(db, spool_id, weight_to_use)
 
diff --git a/tests_integration/tests/spool/test_add.py b/tests_integration/tests/spool/test_add.py
index ed44fa5..c36c506 100644
--- a/tests_integration/tests/spool/test_add.py
+++ b/tests_integration/tests/spool/test_add.py
@@ -201,7 +201,7 @@ def test_add_spool_initial_weight(random_filament: dict[str, Any]):
     """Test adding a spool to the database."""
     # Execute
     remaining_weight = 750
-    initial_weight = 1245
+    initial_weight = 1010
     location = "The Pantry"
     lot_nr = "123456789"
     comment = "abcdefghåäö"
@@ -225,7 +225,7 @@ def test_add_spool_initial_weight(random_filament: dict[str, Any]):
     result.raise_for_status()
 
     # Verify
-    used_weight = initial_weight - random_filament["spool_weight"] - remaining_weight
+    used_weight = initial_weight - remaining_weight
     used_length = length_from_weight(
         weight=used_weight,
         density=random_filament["density"],
@@ -247,7 +247,7 @@ def test_add_spool_initial_weight(random_filament: dict[str, Any]):
             "last_used": "2023-01-02T11:00:00Z",
             "filament": random_filament,
             "initial_weight": pytest.approx(initial_weight),
-            "empty_weight": pytest.approx(random_filament["spool_weight"]),
+            "spool_weight": pytest.approx(random_filament["spool_weight"]),
             "remaining_weight": pytest.approx(remaining_weight),
             "used_weight": pytest.approx(used_weight),
             "remaining_length": pytest.approx(remaining_length),
@@ -268,11 +268,11 @@ def test_add_spool_initial_weight(random_filament: dict[str, Any]):
     httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
 
 
-def test_add_spool_empty_weight(random_filament: dict[str, Any]):
+def test_add_spool_spool_weight(random_filament: dict[str, Any]):
     """Test adding a spool to the database."""
     # Execute
     remaining_weight = 750
-    empty_weight = 200
+    spool_weight = 200
     location = "The Pantry"
     lot_nr = "123456789"
     comment = "abcdefghåäö"
@@ -285,7 +285,7 @@ def test_add_spool_empty_weight(random_filament: dict[str, Any]):
             "last_used": "2023-01-02T11:00:00Z",
             "filament_id": random_filament["id"],
             "remaining_weight": remaining_weight,
-            "empty_weight": empty_weight,
+            "spool_weight": spool_weight,
             "location": location,
             "lot_nr": lot_nr,
             "comment": comment,
@@ -317,8 +317,8 @@ def test_add_spool_empty_weight(random_filament: dict[str, Any]):
             "first_used": "2023-01-02T11:00:00Z",
             "last_used": "2023-01-02T11:00:00Z",
             "filament": random_filament,
-            "initial_weight": pytest.approx(random_filament["weight"] + empty_weight),
-            "empty_weight": pytest.approx(empty_weight),
+            "initial_weight": pytest.approx(random_filament["weight"]),
+            "spool_weight": pytest.approx(spool_weight),
             "remaining_weight": pytest.approx(remaining_weight),
             "used_weight": pytest.approx(used_weight),
             "remaining_length": pytest.approx(remaining_length),
diff --git a/tests_integration/tests/spool/test_get.py b/tests_integration/tests/spool/test_get.py
index f75eee3..6060cf7 100644
--- a/tests_integration/tests/spool/test_get.py
+++ b/tests_integration/tests/spool/test_get.py
@@ -83,8 +83,8 @@ def test_get_spool_default_weights(random_filament: dict[str, Any]):
 
     # Verify
     assert result_spool == spool
-    assert result_spool["initial_weight"] == pytest.approx(random_filament["weight"] + random_filament["spool_weight"])
-    assert result_spool["empty_weight"] == pytest.approx(random_filament["spool_weight"])
+    assert result_spool["initial_weight"] == pytest.approx(random_filament["weight"])
+    assert result_spool["spool_weight"] == pytest.approx(random_filament["spool_weight"])
 
     # Clean up
     httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
@@ -97,7 +97,7 @@ def test_get_spool_weights(random_filament: dict[str, Any]):
     last_used = "2023-01-02T00:00:00"
     remaining_weight = 750
     initial_weight = 1255
-    empty_weight = 246
+    spool_weight = 246
     location = "The Pantry"
     lot_nr = "123456789"
     comment = "abcdefghåäö"
@@ -111,7 +111,7 @@ def test_get_spool_weights(random_filament: dict[str, Any]):
             "filament_id": random_filament["id"],
             "remaining_weight": remaining_weight,
             "initial_weight": initial_weight,
-            "empty_weight": empty_weight,
+            "spool_weight": spool_weight,
             "location": location,
             "lot_nr": lot_nr,
             "comment": comment,
diff --git a/tests_integration/tests/spool/test_measure.py b/tests_integration/tests/spool/test_measure.py
index 13e3552..2d1c2c8 100644
--- a/tests_integration/tests/spool/test_measure.py
+++ b/tests_integration/tests/spool/test_measure.py
@@ -9,21 +9,20 @@ import pytest
 from ..conftest import URL
 
 
-@pytest.mark.parametrize("measurement", [0, 0.05, -0.05, 1000])
+@pytest.mark.parametrize("measurement", [246, 500, 600, 1000])
 def test_measure_spool(random_filament: dict[str, Any], measurement: float):
     """Test using a spool in the database."""
     # Setup
     random_filament["weight"]
-    initial_weight = 1255
-    empty_weight = 246
+    spool_weight = 246
     start_weight = 1000
     result = httpx.post(
         f"{URL}/api/v1/spool",
         json={
             "filament_id": random_filament["id"],
             "remaining_weight": start_weight,
-            "initial_weight": initial_weight,
-            "empty_weight": empty_weight,
+            "initial_weight": start_weight,
+            "spool_weight": spool_weight,
         },
     )
     result.raise_for_status()
@@ -41,9 +40,9 @@ def test_measure_spool(random_filament: dict[str, Any], measurement: float):
     # Verify
     spool = result.json()
     # remaining_weight should be clamped so it's never negative, but used_weight should not be clamped to the net weight
-    expected_use = min(initial_weight - measurement, initial_weight - empty_weight)
+    expected_use = min(start_weight - (measurement - spool_weight), start_weight)
     assert spool["used_weight"] == pytest.approx(expected_use)
-    expected_remaining = max(measurement - empty_weight, 0)
+    expected_remaining = max(measurement - spool_weight, 0)
     assert spool["remaining_weight"] == pytest.approx(expected_remaining)
     # Verify that first_used has been updated
     diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["first_used"])).total_seconds())
@@ -62,16 +61,15 @@ def test_measure_spool_invalid(random_filament: dict[str, Any], measurement: flo
     """Test using a spool in the database."""
     # Setup
     random_filament["weight"]
-    initial_weight = 1255
-    empty_weight = 246
+    spool_weight = 246
     start_weight = 1000
     result = httpx.post(
         f"{URL}/api/v1/spool",
         json={
             "filament_id": random_filament["id"],
             "remaining_weight": start_weight,
-            "initial_weight": initial_weight,
-            "empty_weight": empty_weight,
+            "initial_weight": start_weight,
+            "spool_weight": spool_weight,
         },
     )
     result.raise_for_status()
@@ -96,17 +94,17 @@ def test_measure_spool_sequence(random_filament: dict[str, Any], measurements: l
     """Test using a spool in the database."""
     # Setup
     random_filament["weight"]
-    initial_weight = 1255
+    spool_weight = 246
+    start_weight = 1009
+    initial_weight = start_weight + spool_weight
     current_weight = initial_weight
-    empty_weight = 246
-    start_weight = 1000
     result = httpx.post(
         f"{URL}/api/v1/spool",
         json={
             "filament_id": random_filament["id"],
             "remaining_weight": start_weight,
-            "initial_weight": initial_weight,
-            "empty_weight": empty_weight,
+            "initial_weight": start_weight,
+            "spool_weight": spool_weight,
         },
     )
     result.raise_for_status()
@@ -126,9 +124,9 @@ def test_measure_spool_sequence(random_filament: dict[str, Any], measurements: l
         spool = result.json()
         # remaining_weight should be clamped so it's never negative,
         # but used_weight should not be clamped to the net weight
-        expected_use = min(initial_weight - m, initial_weight - empty_weight)
+        expected_use = min(initial_weight - m, initial_weight - spool_weight)
         assert spool["used_weight"] == pytest.approx(expected_use)
-        expected_remaining = max(m - empty_weight, 0)
+        expected_remaining = max(m - spool_weight, 0)
         assert spool["remaining_weight"] == pytest.approx(expected_remaining)
         # Verify that first_used has been updated
         diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["first_used"])).total_seconds())
@@ -148,17 +146,17 @@ def test_measure_spool_sequence(random_filament: dict[str, Any], measurements: l
 def test_measure_spool_empty(random_empty_filament: dict[str, Any], measurements: list[float]):
     """Test using a spool in the database."""
     # Setup
-    initial_weight = 1255
-    current_weight = initial_weight
-    empty_weight = 246
+    spool_weight = 246
     start_weight = 1000
+    initial_weight = start_weight + spool_weight
+    current_weight = initial_weight
     result = httpx.post(
         f"{URL}/api/v1/spool",
         json={
             "filament_id": random_empty_filament["id"],
             "remaining_weight": start_weight,
-            "initial_weight": initial_weight,
-            "empty_weight": empty_weight,
+            "initial_weight": start_weight,
+            "spool_weight": spool_weight,
         },
     )
     result.raise_for_status()
@@ -178,9 +176,9 @@ def test_measure_spool_empty(random_empty_filament: dict[str, Any], measurements
         spool = result.json()
         # remaining_weight should be clamped so it's never negative,
         # but used_weight should not be clamped to the net weight
-        expected_use = min(initial_weight - m, initial_weight - empty_weight)
+        expected_use = min(initial_weight - m, initial_weight - spool_weight)
         assert spool["used_weight"] == pytest.approx(expected_use)
-        expected_remaining = max(m - empty_weight, 0)
+        expected_remaining = max(m - spool_weight, 0)
         assert spool["remaining_weight"] == pytest.approx(expected_remaining)
         # Verify that first_used has been updated
         diff = abs((datetime.now(tz=timezone.utc) - datetime.fromisoformat(spool["first_used"])).total_seconds())
diff --git a/tests_integration/tests/spool/test_update.py b/tests_integration/tests/spool/test_update.py
index 6822454..4d5e268 100644
--- a/tests_integration/tests/spool/test_update.py
+++ b/tests_integration/tests/spool/test_update.py
@@ -86,7 +86,7 @@ def test_update_spool_weights(random_filament: dict[str, Any]):
             "filament_id": random_filament["id"],
             "remaining_weight": 1000,
             "initial_weight": 1255,
-            "empty_weight": 246,
+            "spool_weight": 246,
             "location": "The Pantry",
             "lot_nr": "123456789",
         },
@@ -98,8 +98,8 @@ def test_update_spool_weights(random_filament: dict[str, Any]):
     first_used = "2023-01-01T12:00:00+02:00"
     last_used = "2023-01-02T12:00:00+02:00"
     remaining_weight = 750
-    initial_weight = 1250
-    empty_weight = 245
+    initial_weight = 1005
+    spool_weight = 245
     location = "Living Room"
     lot_nr = "987654321"
     comment = "abcdefghåäö"
@@ -117,13 +117,13 @@ def test_update_spool_weights(random_filament: dict[str, Any]):
             "archived": archived,
             "price": price,
             "initial_weight": initial_weight,
-            "empty_weight": empty_weight,
+            "spool_weight": spool_weight,
         },
     )
     result.raise_for_status()
 
     # Verify
-    used_weight = initial_weight - empty_weight - remaining_weight
+    used_weight = initial_weight - remaining_weight
     used_length = length_from_weight(
         weight=used_weight,
         density=random_filament["density"],
@@ -139,7 +139,7 @@ def test_update_spool_weights(random_filament: dict[str, Any]):
     assert spool["first_used"] == "2023-01-01T10:00:00Z"
     assert spool["last_used"] == "2023-01-02T10:00:00Z"
     assert spool["initial_weight"] == pytest.approx(initial_weight)
-    assert spool["empty_weight"] == pytest.approx(empty_weight)
+    assert spool["spool_weight"] == pytest.approx(spool_weight)
     assert spool["remaining_weight"] == pytest.approx(remaining_weight)
     assert spool["used_weight"] == pytest.approx(used_weight)
     assert spool["remaining_length"] == pytest.approx(remaining_length)

From 1ec16e64fb6ee5b954d02de67d2eb584ae1dc0c4 Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Mon, 15 Apr 2024 10:44:03 -0400
Subject: [PATCH 14/15] Updated calculation of default values during migration
 and added additional help

---
 client/public/locales/en/common.json                          | 4 ++--
 .../2024_03_26_1349-304a32906234_spool_weight_population.py   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/public/locales/en/common.json b/client/public/locales/en/common.json
index 39b1ed0..8425dfd 100644
--- a/client/public/locales/en/common.json
+++ b/client/public/locales/en/common.json
@@ -160,8 +160,8 @@
             "used_weight": "How much filament has been used from the spool. A new spool should have 0g used.",
             "remaining_weight": "How much filament is left on the spool. For a new spool this should match the spool weight.",
             "measured_weight": "How much the filament and spool weigh.",
-            "initial_weight": "The initial Weight of the filament (net weight)",
-            "spool_weight": "The weight of the spool when it is empty.",
+            "initial_weight": "The initial Weight of the filament (net weight).  This value may come from the filament, but is tracked at the spool level to allow for individual variations the weight of filament on the spool.",
+            "spool_weight": "The weight of the spool when it is empty.  This value may come from either the filament or the vendor, but is tracked at the spool level to allow for individual variations of the weight of an empty spool.",
             "location": "Where the spool is located if you have multiple locations where you store your spools.",
             "lot_nr": "Manufacturer's lot number. Can be used to ensure a print has consistent color if multiple spools are used."
         },
diff --git a/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py b/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
index 1b061fd..79763d4 100644
--- a/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
+++ b/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
@@ -44,7 +44,7 @@ def upgrade() -> None:
     )
 
     initial_weight = (
-        sa.select((filament.c.weight + filament.c.spool_weight).label("initial_weight"))
+        sa.select((filament.c.weight).label("initial_weight"))
         .where(filament.c.id == spool.c.filament_id)
         .scalar_subquery()
     )
@@ -55,7 +55,6 @@ def upgrade() -> None:
 
     set_spool_weight = sa.update(spool).values(spool_weight=spool_weight)
     op.execute(set_spool_weight)
-    pass
 
 
 def downgrade() -> None:

From fdec032d1980f9f3cb06297e5664bdc897fed8ba Mon Sep 17 00:00:00 2001
From: Matt Gerega <gerega@gmail.com>
Date: Mon, 15 Apr 2024 16:41:14 -0400
Subject: [PATCH 15/15] Updated handling of higher measurements

---
 spoolman/database/spool.py                    | 21 ++++++++++++++-----
 tests_integration/tests/spool/test_measure.py | 20 +++++++++++++++---
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py
index 9805498..89adf61 100644
--- a/spoolman/database/spool.py
+++ b/spoolman/database/spool.py
@@ -376,12 +376,12 @@ async def measure(db: AsyncSession, spool_id: int, weight: float) -> models.Spoo
 
     initial_gross_weight = initial_weight + spool_weight
 
-    # Calculate the current gross weight (initial_weight - used_weight)
-    current_use = initial_gross_weight - spool_info[1]
+    # if the measurement is greater than the initial weight, set the initial weight to the measurement
+    if weight > initial_gross_weight:
+        return await reset_initial_weight(db, spool_id, weight - spool_weight)
 
-    # if the measurement is greater than the initial weight, raise an error
-    if weight > current_use:
-        raise SpoolMeasureError("Measured weight cannot increase.")
+    # Calculate the current net weight
+    current_use = initial_gross_weight - spool_info[1]
 
     # Calculate the weight used since last measure
     weight_to_use = current_use - weight
@@ -424,3 +424,14 @@ async def spool_changed(spool: models.Spool, typ: EventType) -> None:
             payload=Spool.from_db(spool),
         ),
     )
+
+
+async def reset_initial_weight(db: AsyncSession, spool_id: int, weight: float) -> models.Spool:
+    """Reset inital weight to new weight and used_weight to 0."""
+    spool = await get_by_id(db, spool_id)
+
+    spool.initial_weight = weight
+    spool.used_weight = 0
+    await db.commit()
+    await spool_changed(spool, EventType.UPDATED)
+    return spool
diff --git a/tests_integration/tests/spool/test_measure.py b/tests_integration/tests/spool/test_measure.py
index 2d1c2c8..567729d 100644
--- a/tests_integration/tests/spool/test_measure.py
+++ b/tests_integration/tests/spool/test_measure.py
@@ -57,7 +57,7 @@ def test_measure_spool(random_filament: dict[str, Any], measurement: float):
 
 
 @pytest.mark.parametrize("measurement", [1500])  # 1500 is more than the initial weight
-def test_measure_spool_invalid(random_filament: dict[str, Any], measurement: float):
+def test_measure_spool_higher_initial(random_filament: dict[str, Any], measurement: float):
     """Test using a spool in the database."""
     # Setup
     random_filament["weight"]
@@ -83,13 +83,27 @@ def test_measure_spool_invalid(random_filament: dict[str, Any], measurement: flo
         },
     )
     # Update is invalid if the weight is more than the initial weight
-    assert result.status_code == 400
+    result.raise_for_status()
 
+    # Verify
+    spool = result.json()
+    # remaining_weight should be clamped so it's never negative,
+    # but used_weight should not be clamped to the net weight
+    expected_use = 0
+    expected_initial_weight = measurement - spool_weight
+    expected_remaining = max(measurement - spool_weight, 0)
+
+    assert spool["used_weight"] == pytest.approx(expected_use)
+    assert spool["remaining_weight"] == pytest.approx(expected_remaining)
+    assert spool["initial_weight"] == pytest.approx(expected_initial_weight)
     # Clean up
     httpx.delete(f"{URL}/api/v1/spool/{spool['id']}").raise_for_status()
 
 
-@pytest.mark.parametrize("measurements", [[1244, 1233, 1200], [1000, 900, 800], [1000, 1000, 1000]])
+@pytest.mark.parametrize(
+    "measurements",
+    [[1244, 1233, 1200], [1000, 900, 800], [1000, 1000, 1000], [1000, 900, 800, 815]],
+)
 def test_measure_spool_sequence(random_filament: dict[str, Any], measurements: list[float]):
     """Test using a spool in the database."""
     # Setup