physpyx 3.0.0__tar.gz → 3.1.0__tar.gz

{physpyx-3.0.0 → physpyx-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: physpyx
-Version: 3.0.0
+Version: 3.1.0
 Summary: Provides a way to use python code in LaTeX
 Author: Jérôme Dufour
 Author-email: Jérôme Dufour <jerome.dufour@eduvaud.ch>

{physpyx-3.0.0 → physpyx-3.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "physpyx"
-version = "3.0.0"
+version = "3.1.0"
 description = "Provides a way to use python code in LaTeX"
 readme = "README.md"
 requires-python = ">=3.13"

{physpyx-3.0.0 → physpyx-3.1.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "physpyx"
-version = "3.0.0"
+version = "3.1.0"
 description = "Provides a way to use python code in LaTeX"
 readme = "README.md"
 requires-python = ">=3.13"

{physpyx-3.0.0 → physpyx-3.1.0}/src/physpyx/qty.py

@@ -1,7 +1,10 @@
 import re
 import sys
+from collections.abc import Iterable
 from logging import getLogger
+from typing import cast
 
+from numpy import array
 from pint._typing import Scalar
 from pint.facets.context import Context
 
@@ -56,7 +59,7 @@ class Qty(PTManager):
 
     def __call__(
         self,
-        value: Scalar | list[Scalar] | str,
+        value: Scalar | Iterable[Scalar | SiunitxQuantity] | str,
         unit: str | None = None,
         to: str | None = None,
         fmt: str = "g",
@@ -90,6 +93,22 @@ class Qty(PTManager):
             if unit is not None:
                 logger.warning("Units are ignored when instanciating a constant")
             value, unit, fmt = self._constants(value, fmt)
+        elif isinstance(value, Iterable):
+            if all(isinstance(item, SiunitxQuantity) for item in value):
+                value = cast(Iterable[SiunitxQuantity], value)
+                dim = {v.dimensionality for v in value}
+                if len(dim) != 1:
+                    raise ValueError(
+                        f"Can't create a vector with different dimensionality ({dim})"
+                    )
+
+                if unit == None:
+                    unit = ""
+                if self._ureg.Unit(unit).dimensionality != dim.pop():
+                    raise ValueError("Need to set unit with correct dimensionality")
+                value = array([v.fmtex(to=unit).m for v in value])
+            else:
+                value = array(value)
 
         q = self._ureg.Quantity(
             value,

{physpyx-3.0.0 → physpyx-3.1.0}/src/physpyx/quantity.py

@@ -1,8 +1,8 @@
-from collections.abc import Generator, Iterator
+from collections.abc import Generator, Iterable, Iterator
 from logging import getLogger
 from typing import ClassVar, Self, TypedDict, cast
 
-from numpy import cross, linalg, ndarray
+from numpy import cross, linalg
 from pint._typing import Magnitude, UnitLike
 from pint.registry import Quantity
 
@@ -82,8 +82,8 @@ class SiunitxQuantity(Quantity):
             return alt
 
     def __iter__(self) -> Iterator["SiunitxQuantity"]:
-        # NOTE: this is used to set formatting options in tuple expansions:
-        # rx, ry = qty([3, 2], "kilometer", fmt=".1e")
+        # NOTE: this is used to set formatting options in tuple expansions rx,
+        # ry = qty([3, 2], "kilometer", fmt=".1e")
         for val in super().__iter__():
             val._fmt = self._fmt
             val._base = self._base
@@ -99,33 +99,35 @@ class SiunitxQuantity(Quantity):
         elif self._preferred:
             quantity = self._REGISTRY.to_preferred_units(self)
         if self._compact:
+            if isinstance(self.m, Iterable):
+                raise ValueError("'compact=True' for vectors has an undefined behavior")
             quantity = cast(SiunitxQuantity, self.to_compact())
 
         quantity._fmt = self._fmt
         return (
             quantity._format_array()
-            if isinstance(quantity.m, ndarray)
+            if isinstance(quantity.m, Iterable)
             else quantity._format_scalar()
         )
 
+    def _format_magnitude(self, m: float) -> str:
+        out = f"{m:{self._fmt}}"
+        if out.startswith("1e"):
+            return out[1:]
+        elif out.startswith("-1e"):
+            return "-" + out[2:]
+        return out
+
     def _format_array(self) -> str:
         if self.m.ndim != 1:
             raise NotImplementedError
         out = r"\begin{pmatrix}"
         if isinstance(self.m[0], complex):
             out += "\\\\".join(
-                [
-                    rf"\complexnum{{{v:{self._fmt}}}}" if abs(v) > 1e-16 else r"\num{0}"
-                    for v in self.m
-                ]
+                rf"\complexnum{{{self._format_magnitude(m)}}}" for m in self.m
             )
         else:
-            out += "\\\\".join(
-                [
-                    rf"\num{{{v:{self._fmt}}}}" if abs(v) > 1e-16 else r"\num{0}"
-                    for v in self.m
-                ]
-            )
+            out += "\\\\".join(rf"\num{{{self._format_magnitude(m)}}}" for m in self.m)
 
         out += r"\end{pmatrix}"
         if ustr := self._format_unit():
@@ -133,9 +135,7 @@ class SiunitxQuantity(Quantity):
         return out
 
     def _format_scalar(self) -> str:
-        out = f"{self.m:{self._fmt}}"
-        if out.startswith("1e"):
-            out = out[1:]
+        out = self._format_magnitude(self.m)
         if ustr := self._format_unit():
             if isinstance(self.m, complex):
                 return rf"\complexqty{{{out}}}{{{ustr}}}"
@@ -157,6 +157,21 @@ class SiunitxQuantity(Quantity):
         # "PlainQuantity[Unknown]"'
         return cast(SiunitxQuantity, super().__add__(other))
 
+    def __truediv__(self, other: object) -> "SiunitxQuantity":
+        # NOTE: to fix typing warning 'Cannot access attribute "???" for class
+        # "PlainQuantity[Unknown]"'
+        return cast(SiunitxQuantity, super().__truediv__(other))
+
+    def __mul__(self, other: object) -> "SiunitxQuantity":
+        # NOTE: to fix typing warning 'Cannot access attribute "???" for class
+        # "PlainQuantity[Unknown]"'
+        return cast(SiunitxQuantity, super().__mul__(other))
+
+    def __rmul__(self, other: object) -> "SiunitxQuantity":
+        # NOTE: to fix typing warning 'Cannot access attribute "???" for class
+        # "PlainQuantity[Unknown]"'
+        return cast(SiunitxQuantity, super().__rmul__(other))
+
     def _format_unit(self) -> str:
         num = ""
         den = ""