ucon 0.6.4__tar.gz → 0.6.6__tar.gz

{ucon-0.6.4 → ucon-0.6.6}/PKG-INFO

@@ -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/tests/ucon/test_mcp_server.py

@@ -0,0 +1,118 @@
+# © 2026 The Radiativity Company
+# Licensed under the Apache License, Version 2.0
+# See the LICENSE file for details.
+
+"""
+Tests for MCP server tools.
+
+Tests the convert, list_units, list_scales, check_dimensions, and
+list_dimensions tools exposed via the MCP server.
+"""
+
+import unittest
+
+try:
+    from ucon.mcp.server import convert, list_units, list_scales, check_dimensions, list_dimensions
+    HAS_MCP = True
+except ImportError:
+    HAS_MCP = False
+
+
+@unittest.skipUnless(HAS_MCP, "MCP not installed")
+class TestConvert(unittest.TestCase):
+    """Test the convert tool."""
+
+    def test_basic_conversion(self):
+        result = convert(1000, "m", "km")
+        self.assertAlmostEqual(result.quantity, 1.0, places=9)
+        self.assertEqual(result.unit, "km")
+
+    def test_returns_target_unit_string(self):
+        """Convert should return the target unit string as requested."""
+        result = convert(100, "cm", "m")
+        self.assertEqual(result.unit, "m")
+
+    def test_ratio_unit_preserved(self):
+        """Ratio units like mg/kg should preserve the unit string."""
+        result = convert(0.1, "mg/kg", "µg/kg")
+        self.assertAlmostEqual(result.quantity, 100.0, places=6)
+        self.assertEqual(result.unit, "µg/kg")
+
+    def test_medical_units(self):
+        """Medical unit aliases should work."""
+        # mcg
+        result = convert(500, "mcg", "mg")
+        self.assertAlmostEqual(result.quantity, 0.5, places=9)
+        self.assertEqual(result.unit, "mg")
+
+        # cc
+        result = convert(5, "cc", "mL")
+        self.assertAlmostEqual(result.quantity, 5.0, places=9)
+        self.assertEqual(result.unit, "mL")
+
+        # min
+        result = convert(120, "mL/h", "mL/min")
+        self.assertAlmostEqual(result.quantity, 2.0, places=9)
+        self.assertEqual(result.unit, "mL/min")
+
+
+@unittest.skipUnless(HAS_MCP, "MCP not installed")
+class TestListUnits(unittest.TestCase):
+    """Test the list_units tool."""
+
+    def test_returns_units(self):
+        result = list_units()
+        self.assertIsInstance(result, list)
+        self.assertGreater(len(result), 0)
+
+    def test_filter_by_dimension(self):
+        result = list_units(dimension="length")
+        self.assertGreater(len(result), 0)
+        for unit in result:
+            self.assertEqual(unit.dimension, "length")
+
+
+@unittest.skipUnless(HAS_MCP, "MCP not installed")
+class TestListScales(unittest.TestCase):
+    """Test the list_scales tool."""
+
+    def test_returns_scales(self):
+        result = list_scales()
+        self.assertIsInstance(result, list)
+        self.assertGreater(len(result), 0)
+
+    def test_includes_kilo(self):
+        result = list_scales()
+        names = [s.name for s in result]
+        self.assertIn("kilo", names)
+
+
+@unittest.skipUnless(HAS_MCP, "MCP not installed")
+class TestCheckDimensions(unittest.TestCase):
+    """Test the check_dimensions tool."""
+
+    def test_compatible(self):
+        result = check_dimensions("m", "ft")
+        self.assertTrue(result.compatible)
+        self.assertEqual(result.dimension_a, "length")
+        self.assertEqual(result.dimension_b, "length")
+
+    def test_incompatible(self):
+        result = check_dimensions("m", "s")
+        self.assertFalse(result.compatible)
+
+
+@unittest.skipUnless(HAS_MCP, "MCP not installed")
+class TestListDimensions(unittest.TestCase):
+    """Test the list_dimensions tool."""
+
+    def test_returns_dimensions(self):
+        result = list_dimensions()
+        self.assertIsInstance(result, list)
+        self.assertIn("length", result)
+        self.assertIn("mass", result)
+        self.assertIn("time", result)
+
+
+if __name__ == '__main__':
+    unittest.main()

{ucon-0.6.4 → ucon-0.6.6}/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-0.6.4 → ucon-0.6.6}/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-0.6.4 → ucon-0.6.6}/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-0.6.4 → ucon-0.6.6}/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 → ucon-0.6.6}/ucon.egg-info/PKG-INFO

@@ -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.4 → ucon-0.6.6}/ucon.egg-info/SOURCES.txt

@@ -34,6 +34,7 @@ tests/ucon/test_default_graph_conversions.py
 tests/ucon/test_dimensionless_units.py
 tests/ucon/test_graph_basis_transform.py
 tests/ucon/test_logmap.py
+tests/ucon/test_mcp_server.py
 tests/ucon/test_nines.py
 tests/ucon/test_pickle.py
 tests/ucon/test_pydantic.py