ENH: Address issues raised by refurb. [skip ci]

Author: Taher Chegini

pygeoogc/cache_keys.py

@@ -56,7 +56,6 @@ def create_request_key(
     norm_url = _normalize_url_params(url, params)
 
     # Create a hash based on the normalized and filtered request
-    key = hashlib.sha256(
+    return hashlib.sha256(
         method.upper().encode() + str(norm_url).encode() + _encode_dict(data) + _encode_dict(json)
-    )
-    return key.hexdigest()
+    ).hexdigest()

pygeoogc/core.py

@@ -123,7 +123,7 @@ def __init__(
     def _set_service_properties(self) -> None:
         rjson = self.get_response(self.base_url, [{"f": "json"}])[0]
         try:
-            self.valid_layers = {f"{lyr['id']}": lyr["name"] for lyr in rjson["layers"]}
+            self.valid_layers = {str(lyr["id"]): lyr["name"] for lyr in rjson["layers"]}
             self.query_formats = rjson["supportedQueryFormats"].replace(" ", "").lower().split(",")
 
             extent = rjson["extent"] if "extent" in rjson else rjson["fullExtent"]
@@ -183,7 +183,7 @@ def _set_layer_properties(self) -> None:
     def initialize_service(self) -> None:
         """Initialize the RESTFul service."""
         self._set_service_properties()
-        if f"{self.layer}" not in self.valid_layers:
+        if str(self.layer) not in self.valid_layers:
             valids = [f'"{i}" for {n}' for i, n in self.valid_layers.items()]
             raise InputValueError("layer", valids)
 
@@ -280,10 +280,10 @@ def get_features(
         payloads = [
             {
                 "objectIds": ",".join(ids),
-                "returnGeometry": f"{return_geom}".lower(),
-                "outSR": f"{self.out_sr}",
+                "returnGeometry": str(return_geom).lower(),
+                "outSR": str(self.out_sr),
                 "outfields": ",".join(self.outfields),
-                "ReturnM": f"{return_m}".lower(),
+                "ReturnM": str(return_m).lower(),
                 "f": self.outformat,
             }
             for ids in featureids
@@ -330,7 +330,7 @@ def retry_failed_requests(self) -> list[dict[str, Any]]:
         features = list(tlz.concat(features))
         self.n_missing -= len(features)
         self.disable_retry = retry
-        os.environ["HYRIVER_CACHE_DISABLE"] = f"{caching}".lower()
+        os.environ["HYRIVER_CACHE_DISABLE"] = str(caching).lower()
         return features
 
     def get_response(

pygeoogc/pygeoogc.py

@@ -171,7 +171,7 @@ def oids_bygeom(
             "f": self.client.outformat,
         }
         if distance:
-            payload.update({"distance": f"{distance}", "units": "esriSRUnit_Meter"})
+            payload.update({"distance": str(int(distance)), "units": "esriSRUnit_Meter"})
 
         if sql_clause:
             payload.update({"where": sql_clause})
@@ -185,7 +185,9 @@ def oids_bygeom(
             msg = resp["error"]["message"] if "error" in resp else "No matched records"
             raise ZeroMatchedError(msg) from ex
 
-    def oids_byfield(self, field: str, ids: str | list[str]) -> Iterator[tuple[str, ...]]:
+    def oids_byfield(
+        self, field: str, ids: str | int | list[str] | list[int]
+    ) -> Iterator[tuple[str, ...]]:
         """Get Object IDs based on a list of field IDs.
 
         Parameters
@@ -208,7 +210,7 @@ def oids_byfield(self, field: str, ids: str | list[str]) -> Iterator[tuple[str,
         if "string" in self.client.field_types.get(field, ""):
             fids = ", ".join(f"'{i}'" for i in ids_ls)
         else:
-            fids = ", ".join(f"{i}" for i in ids_ls)
+            fids = ", ".join(str(i) for i in ids_ls)
 
         return self.oids_bysql(f"{field} IN ({fids})")
 
@@ -451,7 +453,7 @@ def _get_payloads(
             if self.version != "1.1.1" and self.is_geographic and not always_xy:
                 _bbox = (_bbox[1], _bbox[0], _bbox[3], _bbox[2])
             _payload = payload.copy()
-            _payload["bbox"] = f'{",".join(str(round(c, 6)) for c in _bbox)}'
+            _payload["bbox"] = ",".join(str(round(c, 6)) for c in _bbox)
             _payload["width"] = str(_width)
             _payload["height"] = str(_height)
             _payload["layers"] = lyr
@@ -725,7 +727,7 @@ def getfeature_byid(
         if "str" in valid_features[featurename]:
             feat_vals = ", ".join(f"'{fid}'" for fid in set(featureids))
         else:
-            feat_vals = ", ".join(f"{fid}" for fid in set(featureids))
+            feat_vals = ", ".join(str(fid) for fid in set(featureids))
 
         return self.getfeature_byfilter(
             f"{featurename} IN ({feat_vals})", method="POST", sort_attr=featurename