Merge pull request #2075 from mikedh/feat/ukey

Release: load_remote to httpx

pyproject.toml

@@ -5,7 +5,7 @@ requires = ["setuptools >= 61.0", "wheel"]
 [project]
 name = "trimesh"
 requires-python = ">=3.7"
-version = "4.0.4"
+version = "4.0.5"
 authors = [{name = "Michael Dawson-Haggerty", email = "mikedh@kerfed.com"}]
 license = {file = "LICENSE.md"}
 description = "Import, export, process, analyze and view triangular meshes."
@@ -73,7 +73,7 @@ easy = [
     "shapely",
     "xxhash",
     "rtree",
-    "requests",
+    "httpx",
     "scipy",
     "embreex",
     "pillow",

tests/test_dae.py

@@ -29,7 +29,7 @@ def test_duck(self):
         assert len(scene.graph.nodes_geometry) == 1
 
         conv = scene.convert_units("inch")
-        assert conv.units == 'inch'
+        assert conv.units == "inch"
 
     def test_shoulder(self):
         if collada is None:
@@ -40,9 +40,9 @@ def test_shoulder(self):
         assert len(scene.geometry) == 3
         assert len(scene.graph.nodes_geometry) == 3
 
-        assert scene.units != 'mm'
+        assert scene.units != "mm"
         conv = scene.convert_units("mm")
-        assert conv.units == 'mm'
+        assert conv.units == "mm"
 
     def test_export(self):
         if collada is None:
@@ -67,8 +67,7 @@ def test_obj_roundtrip(self):
         assert s.visual.material.baseColorTexture.size == rec.visual.material.image.size
 
         conv = s.convert_units("inch")
-        assert conv.units == 'inch'
-
+        assert conv.units == "inch"
 
     def test_material_round(self):
         """

tests/test_units.py

@@ -59,6 +59,11 @@ def test_path(self):
         # extents should scale exactly with unit conversion
         assert g.np.allclose(p.extents / extents_pre, 25.4, atol=0.01)
 
+    def test_keys(self):
+        units = g.trimesh.units.keys()
+        assert isinstance(units, set)
+        assert "in" in units
+
     def test_arbitrary(self):
         ac = g.np.allclose
         to_inch = g.trimesh.units.to_inch

trimesh/exchange/load.py

@@ -344,10 +344,12 @@ def load_remote(url, **kwargs):
       Loaded result
     """
     # import here to keep requirement soft
-    import requests
+    import httpx
 
     # download the mesh
-    response = requests.get(url)
+    response = httpx.get(url, follow_redirects=True)
+    response.raise_for_status()
+
     # wrap as file object
     file_obj = util.wrap_as_stream(response.content)
 

trimesh/resolvers.py

@@ -354,7 +354,7 @@ def get(self, name):
           Asset name, i.e. 'quadknot.obj.mtl'
         """
         # do import here to keep soft dependency
-        import requests
+        import httpx
 
         # remove leading and trailing whitespace
         name = name.strip()
@@ -363,16 +363,16 @@ def get(self, name):
         # base url has been carefully formatted
         url = self.base_url + name
 
-        response = requests.get(url)
+        response = httpx.get(url, follow_redirects=True)
 
-        if response.status_code != 200:
+        if response.status_code >= 300:
             # try to strip off filesystem crap
             if name.startswith("./"):
                 name = name[2:]
-            response = requests.get(self.base_url + name)
+            response = httpx.get(self.base_url + name, follow_redirects=True)
 
-        if response.status_code == "404":
-            raise ValueError(response.content)
+        # now raise if we don't have
+        response.raise_for_status()
 
         # return the bytes of the response
         return response.content

trimesh/units.py

@@ -34,6 +34,18 @@ def unit_conversion(current: str, desired: str) -> float:
     return to_inch(current.strip().lower()) / to_inch(desired.strip().lower())
 
 
+def keys() -> set:
+    """
+    Return a set containing all currently valid units.
+
+    Returns
+    --------
+    keys
+      All units with conversions i.e. {'in', 'm', ...}
+    """
+    return set(_lookup.keys())
+
+
 def to_inch(unit: str) -> float:
     """
     Calculate the conversion to an arbitrary common unit.

trimesh/visual/gloss.py

@@ -180,9 +180,7 @@ def get_specular_glossiness(
                 or specularGlossinessTexture.shape[-1]
             ) == 1:
                 # use the one channel as a multiplier for specular and glossiness
-                specularTexture = glossinessTexture = specularGlossinessTexture.reshape(
-                    (-1, -1, 1)
-                )
+                specularTexture = glossinessTexture = specularGlossinessTexture[..., np.newaxis]
             elif specularGlossinessTexture.shape[-1] == 3:
                 # all channels are specular, glossiness is only a factor
                 specularTexture = specularGlossinessTexture[..., :3]