ucon 0.6.4__py3-none-any.whl → 0.6.6__py3-none-any.whl

ucon/core.py

@@ -99,6 +99,8 @@ class Dimension(Enum):
     permittivity = Vector(4, -3, -1, 2, 0, 0, 0, 0)
     power = Vector(-3, 2, 1, 0, 0, 0, 0, 0)
     pressure = Vector(-2, -1, 1, 0, 0, 0, 0, 0)
+    dynamic_viscosity = Vector(-1, -1, 1, 0, 0, 0, 0, 0)    # M·L⁻¹·T⁻¹ (Pa·s)
+    kinematic_viscosity = Vector(-1, 2, 0, 0, 0, 0, 0, 0)   # L²·T⁻¹ (m²/s)
     resistance = Vector(-3, 2, 1, -2, 0, 0, 0, 0)
     resistivity = Vector(-3, 3, 1, -2, 0, 0, 0, 0)
     specific_heat_capacity = Vector(-2, 2, 0, 0, -1, 0, 0, 0)

ucon/graph.py

@@ -555,6 +555,8 @@ def _build_standard_graph() -> ConversionGraph:
     graph.add_edge(src=units.celsius, dst=units.kelvin, map=AffineMap(1, 273.15))
     # F → C: C = (F - 32) * 5/9
     graph.add_edge(src=units.fahrenheit, dst=units.celsius, map=AffineMap(5/9, -32 * 5/9))
+    # K → °R: °R = K × 9/5 (both absolute scales, same zero point)
+    graph.add_edge(src=units.kelvin, dst=units.rankine, map=LinearMap(9/5))
 
     # --- Pressure ---
     # 1 Pa = 0.00001 bar, so 1 bar = 100000 Pa
@@ -563,6 +565,28 @@ def _build_standard_graph() -> ConversionGraph:
     graph.add_edge(src=units.pascal, dst=units.psi, map=LinearMap(0.000145038))
     # 1 atm = 101325 Pa
     graph.add_edge(src=units.atmosphere, dst=units.pascal, map=LinearMap(101325))
+    # 1 torr = 133.322368 Pa
+    graph.add_edge(src=units.torr, dst=units.pascal, map=LinearMap(133.322368))
+    # 1 mmHg ≈ 1 torr (by definition, at 0°C)
+    graph.add_edge(src=units.millimeter_mercury, dst=units.torr, map=LinearMap(1.0))
+    # 1 inHg = 3386.389 Pa
+    graph.add_edge(src=units.inch_mercury, dst=units.pascal, map=LinearMap(3386.389))
+
+    # --- Force ---
+    # 1 lbf = 4.4482216152605 N (exact, from lb_m × g_n)
+    graph.add_edge(src=units.pound_force, dst=units.newton, map=LinearMap(4.4482216152605))
+    # 1 kgf = 9.80665 N (exact, by definition)
+    graph.add_edge(src=units.kilogram_force, dst=units.newton, map=LinearMap(9.80665))
+    # 1 dyne = 1e-5 N (CGS unit)
+    graph.add_edge(src=units.dyne, dst=units.newton, map=LinearMap(1e-5))
+
+    # --- Dynamic Viscosity ---
+    # 1 poise = 0.1 Pa·s (CGS unit)
+    graph.add_edge(src=units.poise, dst=units.pascal * units.second, map=LinearMap(0.1))
+
+    # --- Kinematic Viscosity ---
+    # 1 stokes = 1e-4 m²/s (CGS unit)
+    graph.add_edge(src=units.stokes, dst=units.meter ** 2 / units.second, map=LinearMap(1e-4))
 
     # --- Volume ---
     graph.add_edge(src=units.liter, dst=units.gallon, map=LinearMap(0.264172))

ucon/mcp/server.py

@@ -91,16 +91,11 @@ def convert(value: float, from_unit: str, to_unit: str) -> ConversionResult:
     num = Number(quantity=value, unit=src)
     result = num.to(dst)
 
-    unit_str = None
-    dim_name = "none"
-
-    if result.unit:
-        if isinstance(result.unit, UnitProduct):
-            unit_str = result.unit.shorthand
-            dim_name = result.unit.dimension.name
-        elif isinstance(result.unit, Unit):
-            unit_str = result.unit.shorthand
-            dim_name = result.unit.dimension.name
+    # Use the target unit string as output (what the user asked for).
+    # This handles cases like mg/kg → µg/kg where internal representation
+    # may lose unit info due to dimension cancellation.
+    unit_str = to_unit
+    dim_name = dst.dimension.name if hasattr(dst, 'dimension') else "none"
 
     return ConversionResult(
         quantity=result.quantity,

ucon/units.py

@@ -80,6 +80,12 @@ webers_per_meter = Unit(name='webers_per_meter', dimension=Dimension.magnetic_pe
 # ----------------------------------------------------------------------
 
 
+# -- Viscosity Units ---------------------------------------------------
+poise = Unit(name='poise', dimension=Dimension.dynamic_viscosity, aliases=('P',))
+stokes = Unit(name='stokes', dimension=Dimension.kinematic_viscosity, aliases=('St',))
+# ----------------------------------------------------------------------
+
+
 # -- Time Units --------------------------------------------------------
 second = Unit(name='second', dimension=Dimension.time, aliases=('s', 'sec'))
 minute = Unit(name='minute', dimension=Dimension.time, aliases=('min',))
@@ -101,6 +107,7 @@ ounce = Unit(name='ounce', dimension=Dimension.mass, aliases=('oz', 'ounces'))
 
 # Temperature
 fahrenheit = Unit(name='fahrenheit', dimension=Dimension.temperature, aliases=('°F', 'degF'))
+rankine = Unit(name='rankine', dimension=Dimension.temperature, aliases=('°R', 'degR', 'R'))
 
 # Volume
 gallon = Unit(name='gallon', dimension=Dimension.volume, aliases=('gal', 'gallons'))
@@ -116,6 +123,14 @@ horsepower = Unit(name='horsepower', dimension=Dimension.power, aliases=('hp',))
 bar = Unit(name='bar', dimension=Dimension.pressure, aliases=('bar',))
 psi = Unit(name='psi', dimension=Dimension.pressure, aliases=('psi', 'lbf/in²'))
 atmosphere = Unit(name='atmosphere', dimension=Dimension.pressure, aliases=('atm',))
+torr = Unit(name='torr', dimension=Dimension.pressure, aliases=('Torr',))
+millimeter_mercury = Unit(name='millimeter_mercury', dimension=Dimension.pressure, aliases=('mmHg',))
+inch_mercury = Unit(name='inch_mercury', dimension=Dimension.pressure, aliases=('inHg',))
+
+# Force
+pound_force = Unit(name='pound_force', dimension=Dimension.force, aliases=('lbf',))
+kilogram_force = Unit(name='kilogram_force', dimension=Dimension.force, aliases=('kgf',))
+dyne = Unit(name='dyne', dimension=Dimension.force, aliases=('dyn',))
 # ----------------------------------------------------------------------
 
 

{ucon-0.6.4.dist-info → ucon-0.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ucon
-Version: 0.6.4
+Version: 0.6.6
 Summary: A tool for dimensional analysis: a 'Unit CONverter'
 Home-page: https://github.com/withtwoemms/ucon
 Author: Emmanuel I. Obi

ucon-0.6.6.dist-info/RECORD

@@ -0,0 +1,17 @@
+ucon/__init__.py,sha256=SAXuDNMmxzaLVr4JpUHsz-feQotVhpzsCUj2WiXYA-0,2361
+ucon/algebra.py,sha256=6QrPyD23L93XSrnIORcYEx2CLDv4WDcrh6H_hxeeOus,8668
+ucon/core.py,sha256=uwMi17VuJbE-P0aSpfGgTPLmRjVLeqfXIaemR2N1Ooo,63470
+ucon/graph.py,sha256=qjA5g67scHLZsQoHaG5Z2bN8VgamSByp6oKp7-rUc3c,22586
+ucon/maps.py,sha256=-rPMOHylcQYUn62R9IU23bXdCRCRNBhdH3UD4G5IUEk,9123
+ucon/pydantic.py,sha256=64ZR1EYFRnBGHj3VIF5pc3swdAiR2ZlYrgcntdbKN4k,5189
+ucon/quantity.py,sha256=GBxZ_96nocx-8F-usNWGbPvWHRhRgdZzqfH9Sx69iC4,465
+ucon/units.py,sha256=jAerucV7GDbVdwh7BY-8SsnoqsMYMjTzgs5YZz30xGc,18344
+ucon/mcp/__init__.py,sha256=WoFOQ7JeDIzbjjkFIJ0Uv53VVLu-4lrjzG5vpVGGfT4,123
+ucon/mcp/server.py,sha256=RDKFvr_NtLNd8UBQp1wCDUpgnF0OYucn6woMi3JP8E0,6971
+ucon-0.6.6.dist-info/licenses/LICENSE,sha256=LtimSYBSw1L_X6n1-VEdZRdwuROzPumrMUNX21asFuI,11356
+ucon-0.6.6.dist-info/licenses/NOTICE,sha256=bh4fBOItio3kM4hSNYhqfFpcaAvOoixjD7Du8im-sYA,1079
+ucon-0.6.6.dist-info/METADATA,sha256=Bz39ydFUit_y8uK9BWDS6cJdmmMhI4Q9WBqYljcDR4k,17397
+ucon-0.6.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+ucon-0.6.6.dist-info/entry_points.txt,sha256=jbfLf0FbOulgGa0nM_sRiTNfiCAkJcHnSSK_oj3g0cQ,50
+ucon-0.6.6.dist-info/top_level.txt,sha256=Vv3KDuZ86fmH5yOYLbYap9DbBblK1YUkmlThffF71jA,5
+ucon-0.6.6.dist-info/RECORD,,

ucon-0.6.4.dist-info/RECORD

@@ -1,17 +0,0 @@
-ucon/__init__.py,sha256=SAXuDNMmxzaLVr4JpUHsz-feQotVhpzsCUj2WiXYA-0,2361
-ucon/algebra.py,sha256=6QrPyD23L93XSrnIORcYEx2CLDv4WDcrh6H_hxeeOus,8668
-ucon/core.py,sha256=V10GfKTf28GFgoO9NMI7ciqKHI_p8wG8qICR6u85gv0,63300
-ucon/graph.py,sha256=vBIKwppYCAu5sw6R_3zTBlnOk2WmYMClIb6j5kDvJHI,21342
-ucon/maps.py,sha256=-rPMOHylcQYUn62R9IU23bXdCRCRNBhdH3UD4G5IUEk,9123
-ucon/pydantic.py,sha256=64ZR1EYFRnBGHj3VIF5pc3swdAiR2ZlYrgcntdbKN4k,5189
-ucon/quantity.py,sha256=GBxZ_96nocx-8F-usNWGbPvWHRhRgdZzqfH9Sx69iC4,465
-ucon/units.py,sha256=T410Haid7PBLKQgxEfUGKheOAj61E3gRCau4aw0NNJM,17414
-ucon/mcp/__init__.py,sha256=WoFOQ7JeDIzbjjkFIJ0Uv53VVLu-4lrjzG5vpVGGfT4,123
-ucon/mcp/server.py,sha256=uUrdevEaR65Qjh9xn8Q-_IusNjPGxdkLF9iQmiSTs0g,7016
-ucon-0.6.4.dist-info/licenses/LICENSE,sha256=LtimSYBSw1L_X6n1-VEdZRdwuROzPumrMUNX21asFuI,11356
-ucon-0.6.4.dist-info/licenses/NOTICE,sha256=bh4fBOItio3kM4hSNYhqfFpcaAvOoixjD7Du8im-sYA,1079
-ucon-0.6.4.dist-info/METADATA,sha256=gdY9jvge5vPs_uocKQHXM-TB3Pq-Dw877y3nCdQYhGs,17397
-ucon-0.6.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-ucon-0.6.4.dist-info/entry_points.txt,sha256=jbfLf0FbOulgGa0nM_sRiTNfiCAkJcHnSSK_oj3g0cQ,50
-ucon-0.6.4.dist-info/top_level.txt,sha256=Vv3KDuZ86fmH5yOYLbYap9DbBblK1YUkmlThffF71jA,5
-ucon-0.6.4.dist-info/RECORD,,